Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

15 files changed, 62 insertions, 43 deletions

diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass
deleted file mode 100644
index cb13222d64..0000000000
--- a/classes/lsppchd-image.bbclass
+++ /dev/null
@@ -1,10 +0,0 @@
-IMAGE_PREPROCESS_COMMAND_lsppchd += "export KPATH=`ls -tr ${IMAGE_ROOTFS}/boot/uImage-* | tail -1`; ln -sf /boot/${KPATH##*/} ${IMAGE_ROOTFS}/boot/uImage;"
-IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
-IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
-IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
-
-lsppchd_pack_image() {
-:
-}
-
-IMAGE_POSTPROCESS_COMMAND += "lsppchd_pack_image; "
diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass
deleted file mode 100644
index 553414224d..0000000000
--- a/classes/lsppchg-image.bbclass
+++ /dev/null
@@ -1,10 +0,0 @@
-IMAGE_PREPROCESS_COMMAND_lsppchg += "export KPATH=`ls -tr ${IMAGE_ROOTFS}/boot/uImage-* | tail -1`; ln -sf /boot/${KPATH##*/} ${IMAGE_ROOTFS}/boot/uImage;"
-IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
-IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
-IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
-
-lsppchg_pack_image() {
-:
-}
-
-IMAGE_POSTPROCESS_COMMAND += "lsppchg_pack_image; "
diff --git a/conf/checksums.ini b/conf/checksums.ini
index da385997ab..384e6ef82c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2310,6 +2310,10 @@ sha256=eaa1a9746a4613a75a9fe9fc0c54a724758b899c5a898b8b50578066d8a82ead
 md5=f8b14e9d87dfe9fa56a7549b16e0cf3e
 sha256=ad1cbca751301b5b8c735509b905bf7642de6110ec3dda939153cbb9df6db8cb
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.27.tar.gz]
+md5=4f0bd19dd04a32eba6149b82b26c3f30
+sha256=9e042fcf2d29a58bd60fe3743130095992c62da4c865d01e6fea2d8d6d20583a
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
diff --git a/conf/machine/include/lsppc.inc b/conf/machine/include/lsppc.inc
index 673ce4b447..8a868cbd05 100644
--- a/conf/machine/include/lsppc.inc
+++ b/conf/machine/include/lsppc.inc
@@ -5,7 +5,7 @@
 
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
+MACHINE_FEATURES = "kernel26 usbhost ext2"
 
 USE_DEVFS = "0"
 
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index 5d2ff2de41..171253bb96 100644
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
 #@NAME: HD Linkstation
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
+
 UBOOT_MACHINE = "linkstation_HDLAN_config"
-require conf/machine/include/lsppc.inc
 
-INHERIT += "lsppchd-image"
+require conf/machine/include/lsppc.inc
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index 92e4ae4029..0a0d2fc1e1 100644
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
 #@NAME: HG Linkstation
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
+
 UBOOT_MACHINE = "linkstation_HGLAN_config"
-require conf/machine/include/lsppc.inc
 
-INHERIT += "lsppchg-image"
+require conf/machine/include/lsppc.inc
diff --git a/packages/bluez/bluez4-utils_4.24.bb b/packages/bluez/bluez4-utils_4.27.bb
index b7e2efa387..e10d603e1c 100644
--- a/packages/bluez/bluez4-utils_4.24.bb
+++ b/packages/bluez/bluez4-utils_4.27.bb
@@ -1,6 +1,6 @@
 require bluez.inc
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
            file://hcid.conf \
diff --git a/packages/bluez/bluez4_4.27.bb b/packages/bluez/bluez4_4.27.bb
new file mode 100644
index 0000000000..a54d656e5f
--- /dev/null
+++ b/packages/bluez/bluez4_4.27.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland V4"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "gst-plugins-base alsa-libs"
+HOMEPAGE = "http://www.bluez.org"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+  --enable-gstreamer \
+  --enable-alsa \
+  --disable-usb \
+  --enable-netlink \
+  --enable-tools \
+  --enable-bccmd \
+  --enable-hid2hci \
+  --enable-dfutool \
+  --enable-hidd \
+  --enable-pandd \
+  --enable-dund \
+  --disable-cups \
+  --enable-test \
+  --enable-manpages \
+  --enable-configfiles \
+  --enable-initscripts \
+  --disable-pcmciarules \
+"
+
+PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
+
+FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
+FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
+FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
+FILES_${PN}-dev += "\
+  ${libdir}/bluetooth/plugins/*.la \
+  ${libdir}/gstreamer-0.10/lib*.la \
+"
+FILES_${PN}-dbg += "\
+  ${libdir}/bluetooth/plugins/.debug \
+  ${libdir}/gstreamer-0.10/.debug \
+"
diff --git a/packages/bluez/bluez4_4.7.bb b/packages/bluez/bluez4_4.7.bb
deleted file mode 100644
index ae579dd0ae..0000000000
--- a/packages/bluez/bluez4_4.7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland."
-SECTION = "libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz"
-S = "${WORKDIR}/bluez-${PV}"
-
-inherit autotools pkgconfig
diff --git a/packages/freesmartphone/frameworkd-devel_git.bb b/packages/freesmartphone/frameworkd-devel_git.bb
index 0024f95b48..cb52fbc4f5 100644
--- a/packages/freesmartphone/frameworkd-devel_git.bb
+++ b/packages/freesmartphone/frameworkd-devel_git.bb
@@ -3,7 +3,7 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNA
 PROVIDES = "frameworkd"
 RPROVIDES = "frameworkd"
 PV = "0.8.5.x+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 # skip this package
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index f893afc2cb..ee155e64a6 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.4.9+gitr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 inherit distutils update-rc.d
 
diff --git a/packages/freesmartphone/mickeydbus_git.bb b/packages/freesmartphone/mickeydbus_git.bb
index 404bb05ae1..4774f84ba1 100644
--- a/packages/freesmartphone/mickeydbus_git.bb
+++ b/packages/freesmartphone/mickeydbus_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 PV = "0.9.2+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
diff --git a/packages/freesmartphone/mickeyterm_git.bb b/packages/freesmartphone/mickeyterm_git.bb
index acef04ce2b..276eeb55ab 100644
--- a/packages/freesmartphone/mickeyterm_git.bb
+++ b/packages/freesmartphone/mickeyterm_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 PV = "2.9.1+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
diff --git a/packages/freesmartphone/multicat_git.bb b/packages/freesmartphone/multicat_git.bb
index fb2b332143..c9344390ed 100644
--- a/packages/freesmartphone/multicat_git.bb
+++ b/packages/freesmartphone/multicat_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console"
 LICENSE = "GPLv2"
 PV = "0.0.0+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index 1526ce6392..0fcc25c5f6 100644
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "edje-native python-pyrex-native python-cython-native"
 PV = "0.0.2+gitr${SRCREV}"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
            file://80zhone"