[oe-commits] org.oe.dev merge of '2b0c6d15b30870f04728a138d2e30c4720e47fa6'

[rwhitby commit]

merge of '2b0c6d15b30870f04728a138d2e30c4720e47fa6'
     and '7dcfdc2af0ae972634d8a71244289786c34a446b'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: aada1c94bab4bdb5b5ca29add9a330cafa8eafe7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=aada1c94bab4bdb5b5ca29add9a330cafa8eafe7
Files:
1
classes/rm_work.bbclass
packages/gpsd/gpsd.inc
packages/apex/apex-nslu2-16mb_1.5.8.bb
packages/apex/apex-nslu2_1.5.8.bb
Diffs:

#
# mt diff -r2b0c6d15b30870f04728a138d2e30c4720e47fa6 -raada1c94bab4bdb5b5ca29add9a330cafa8eafe7
#
# 
# 
# patch "classes/rm_work.bbclass"
#  from [3c8ff49c617d0924fef4b991d29f8b91ab35b298]
#    to [80b9b22e230989c7a6265d0b1860252d37fca5fb]
# 
# patch "packages/gpsd/gpsd.inc"
#  from [bf39dceefc04642d65caefe9f5ad7660f44eb04a]
#    to [6ccdc1d0e17c682348f2cf4bf46c24536c69178d]
# 
============================================================
--- classes/rm_work.bbclass	3c8ff49c617d0924fef4b991d29f8b91ab35b298
+++ classes/rm_work.bbclass	80b9b22e230989c7a6265d0b1860252d37fca5fb
@@ -7,7 +7,7 @@ RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}"
 #
 
 RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}"
-BB_DEFAULT_TASK = "rm_work"
+BB_DEFAULT_TASK = "rm_work_all"
 
 do_rm_work () {
     cd ${WORKDIR}
@@ -23,4 +23,9 @@ addtask rm_work after do_build
 # Uncomment me when we can use bitbake 1.8.8
 #addtask rm_work after do_${RMWORK_ORIG_TASK}
 addtask rm_work after do_build
+
+do_rm_work_all () {
+	:
+}
+do_rm_work_all[recrdeptask] = "do_rm_work"
+addtask rm_work_all
-do_rm_work[recrdeptask] = "do_rm_work"
============================================================
--- packages/gpsd/gpsd.inc	bf39dceefc04642d65caefe9f5ad7660f44eb04a
+++ packages/gpsd/gpsd.inc	6ccdc1d0e17c682348f2cf4bf46c24536c69178d
@@ -7,7 +7,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR} \
                 --enable-dbus \
-                --disable-python"
+                --enable-python"
 
 SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
            file://gpsd-default \
@@ -23,6 +23,7 @@ do_compile_prepend() {
 do_compile_prepend() {
     export BUILD_SYS="${BUILD_SYS}"
     export HOST_SYS="${HOST_SYS}"
+	find ${S} -name "*.so" -exec rm -f {} \;
 }
 
 do_install_prepend() {
@@ -48,7 +49,7 @@ FILES_${PN} += "${sysconfdir}"
 PACKAGES =+ "libgps python-pygps"
 
 FILES_${PN} += "${sysconfdir}"
-FILES_libgps = "${libdir}/*.so*"
+FILES_libgps = "${libdir}/*.so.*"
 CONFFILES_${PN} = "${sysconfdir}/default/gpsd"
 
 DESCRIPTION_python-pygps = "Python bindings to gpsd"


#
# mt diff -r7dcfdc2af0ae972634d8a71244289786c34a446b -raada1c94bab4bdb5b5ca29add9a330cafa8eafe7
#
# 
# 
# patch "packages/apex/apex-nslu2-16mb_1.5.8.bb"
#  from [14115392139c7f57ea82db2f816b5069fffa2238]
#    to [fac18deeba57a44702190636a5aeb017a33d2e86]
# 
# patch "packages/apex/apex-nslu2_1.5.8.bb"
#  from [a955d4e6ecf87a690890636436fb86c26ee760ec]
#    to [15acb3b25031d818b76e970bb441e2b3b6844d3d]
# 
============================================================
--- packages/apex/apex-nslu2-16mb_1.5.8.bb	14115392139c7f57ea82db2f816b5069fffa2238
+++ packages/apex/apex-nslu2-16mb_1.5.8.bb	fac18deeba57a44702190636a5aeb017a33d2e86
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "APEX Boot Loader"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
 
 # Note that this recipe only works for the NSLU2 at the moment.
 # Patches to make it more generic are welcome.
@@ -20,6 +20,8 @@ CMDLINE_ROOT_nas100d = "root=/dev/mtdblo
 CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
 CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
 
+CMDLINE_DEBUG ?= ""
+
 EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
 
 oe_runmake() {
============================================================
--- packages/apex/apex-nslu2_1.5.8.bb	a955d4e6ecf87a690890636436fb86c26ee760ec
+++ packages/apex/apex-nslu2_1.5.8.bb	15acb3b25031d818b76e970bb441e2b3b6844d3d
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "APEX Boot Loader"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
 
 # Note that this recipe only works for the NSLU2 at the moment.
 # Patches to make it more generic are welcome.
@@ -20,6 +20,8 @@ CMDLINE_ROOT_nas100d = "root=/dev/mtdblo
 CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
 CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
 
+CMDLINE_DEBUG ?= ""
+
 EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
 
 oe_runmake() {