[oe-commits] org.oe.dev merge of '3138c13a7a9b08f8cfb5650c96e544ad82b3b84a'

[kristoffer commit]

merge of '3138c13a7a9b08f8cfb5650c96e544ad82b3b84a'
     and '4c78f5500334d26f8fcbdeda6f4a013b43269e86'

Author: kristoffer at openembedded.org
Branch: org.openembedded.dev
Revision: 17f4c4ba22df63701dacab5a2056bb6c3a2877f5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=17f4c4ba22df63701dacab5a2056bb6c3a2877f5
Files:
1
packages/bluez/bluez-utils_3.12.bb
packages/linux/linux-jlime-current.bb
conf/machine/qemuarm.conf
packages/linux/linux-hackndev-2.6_svn.bb
Diffs:

#
# mt diff -r3138c13a7a9b08f8cfb5650c96e544ad82b3b84a -r17f4c4ba22df63701dacab5a2056bb6c3a2877f5
#
# 
# 
# patch "packages/bluez/bluez-utils_3.12.bb"
#  from [d055686db47812d24a22cc691636452724043cdd]
#    to [c9a40ce5190424b1ede28c8cc855bb8d094a3186]
# 
============================================================
--- packages/bluez/bluez-utils_3.12.bb	d055686db47812d24a22cc691636452724043cdd
+++ packages/bluez/bluez-utils_3.12.bb	c9a40ce5190424b1ede28c8cc855bb8d094a3186
@@ -6,7 +6,7 @@ SRC_URI = "http://bluez.sourceforge.net/
            file://hcid.conf \
            file://02dtl1_cs.sh \
           "
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = " \
                  --enable-bccmd \
@@ -103,6 +103,7 @@ FILES_${PN}-compat = " \
 		    ${base_sbindir}/hciconfig \
                     ${base_sbindir}/bccmd \
 		    ${base_sbindir}/hciemu \
+		    ${base_sbindir}/hid2hci \
 		    ${base_bindir}/passkey-agent \
 		    ${sysconfdir}/bluetooth/rfcomm.conf \
 		   " 


#
# mt diff -r4c78f5500334d26f8fcbdeda6f4a013b43269e86 -r17f4c4ba22df63701dacab5a2056bb6c3a2877f5
#
# 
# 
# add_file "packages/linux/linux-jlime-current.bb"
#  content [98561aec73b65b0c3c3d959844b4af4777b4babe]
# 
# patch "conf/machine/qemuarm.conf"
#  from [75170dd73108ad6e019e6a62a0292301fb1791e6]
#    to [0ec5ee82b21a74e9cbfd0be99314eb9396eb10de]
# 
# patch "packages/linux/linux-hackndev-2.6_svn.bb"
#  from [7a018d1bec93dacb0e6ce8b6fa43ae2b68cdfc81]
#    to [98b0ad7705650196802daa4da3d54d58720ba83a]
# 
============================================================
--- packages/linux/linux-jlime-current.bb	98561aec73b65b0c3c3d959844b4af4777b4babe
+++ packages/linux/linux-jlime-current.bb	98561aec73b65b0c3c3d959844b4af4777b4babe
@@ -0,0 +1,19 @@
+###########################################################################
+# Currently supports :
+#   HP Jornada 620/660/680/690
+#   HP Jornada 710/720/728
+#   Nec Mobilepro 900c
+#   Nec Mobilpro  770/880
+
+DESCRIPTION = "2.6 Linux Development Kernel for JLime supported Machines."
+SECTION = "kernel"
+LICENSE = "GPL"
+
+inherit kernel
+
+PR = "r1"
+
+SRC_URI = "git://filip.eu.org/jlime-current.git;protocol=git; \
+           git://filip.eu.org/jlime.git;protocol=git;"
+
+S = "${WORKDIR}/jlime-current"
============================================================
--- conf/machine/qemuarm.conf	75170dd73108ad6e019e6a62a0292301fb1791e6
+++ conf/machine/qemuarm.conf	0ec5ee82b21a74e9cbfd0be99314eb9396eb10de
@@ -1,9 +1,9 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: qemu ARM Emulator setup
 #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 require conf/machine/include/qemu.conf
 require conf/machine/include/tune-arm926ejs.conf
============================================================
--- packages/linux/linux-hackndev-2.6_svn.bb	7a018d1bec93dacb0e6ce8b6fa43ae2b68cdfc81
+++ packages/linux/linux-hackndev-2.6_svn.bb	98b0ad7705650196802daa4da3d54d58720ba83a
@@ -19,7 +19,7 @@ K_MICRO = "21"
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "21"
-HHV="hnd1"
+HHV="hnd2"
 PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-${HHV}"
 
 inherit kernel