From 89a425310ccdaee19b97091b7ee584fe98b4a6ea Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 18 Aug 2007 23:56:11 +0000
Subject: rm_work.bbclass: Split up the dependency chain to resolve dependency
 conflicts

---
 classes/rm_work.bbclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass
index 0f613b7a95..e0a4ccf133 100644
--- a/classes/rm_work.bbclass
+++ b/classes/rm_work.bbclass
@@ -7,7 +7,7 @@
 #
 
 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 @@ do_rm_work () {
 # 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[recrdeptask] = "do_rm_work"
+
+do_rm_work_all () {
+	:
+}
+do_rm_work_all[recrdeptask] = "do_rm_work"
+addtask rm_work_all
-- 
cgit v1.2.3


From e3e2e97be9b8bbc8a08819932c5ffb9babffd614 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 19 Aug 2007 00:11:36 +0000
Subject: gpsd: compile python extension. upstream vendor included x86 binary
 in tarball (tss...). fixes #1665

---
 packages/gpsd/gpsd.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index b43c50b58c..d493b2bca7 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -7,7 +7,7 @@ DEPENDS = "dbus-glib ncurses python"
 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 @@ export LDFLAGS = "-L${STAGING_LIBDIR} -lm"
 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 @@ do_install_append() {
 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"
-- 
cgit v1.2.3