From 4f5e62451f9d7bdbbfff7e3b37afdf84e80a564c Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 22 Jul 2005 23:48:46 +0000
Subject: Add some bits to fixup some rough edges in the SDK filesystem: -
 Remove broken *.la files. - Fix pathes in *.pc files.

---
 packages/meta/meta-sdk.bb | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 962572d546..565988763b 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,7 +1,7 @@
-PR = "r3"
-
+PR      = "r4"
+LICENSE = MIT
 DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe"
-DEPENDS += "libidl libsvg-cairo"
+DEPENDS += "libidl libsvg-cairo sed-native"
 
 PACKAGES = ""
 
@@ -153,6 +153,18 @@ EOF
 	# remove unwanted executables
 	rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
 
+	# remove broken .la files
+	rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la
+
+	# fix pkgconfig data files
+	cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig
+	for f in *.pc ; do
+		sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f"
+	done
+	for f in *.pc ; do
+		sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f"
+	done
+
         mkdir -p ${SDK_DEPLOY}
 	cd ${SDK_OUTPUT}
 	fakeroot tar cfj ${SDK_DEPLOY}/oe-sdk-$(date +"%Y%m%d%H%M%S").tar.bz2 .
@@ -160,4 +172,3 @@ EOF
 
 do_populate_sdk[nostamp] = 1
 addtask populate_sdk before do_build after do_install
-LICENSE = MIT
-- 
cgit v1.2.3


From 9be7bac9de4e2f1a9f910334c49608e61f7b1369 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 23 Jul 2005 12:58:01 +0000
Subject: Fix gpsdrive patch again

---
 packages/gpsdrive/files/gpsdrive-pda-fix.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/gpsdrive/files/gpsdrive-pda-fix.patch b/packages/gpsdrive/files/gpsdrive-pda-fix.patch
index f76d83e3ad..85f220bd16 100644
--- a/packages/gpsdrive/files/gpsdrive-pda-fix.patch
+++ b/packages/gpsdrive/files/gpsdrive-pda-fix.patch
@@ -1,5 +1,5 @@
---- src/gpsdrive.c	2005-07-22 23:17:36.452918848 +0200
-+++ src/gpsdrive.c	2005-07-23 01:02:40.482560672 +0200
+--- gpsdrive/src/gpsdrive.c	2005-07-22 23:17:36.452918848 +0200
++++ gpsdrive/src/gpsdrive.c	2005-07-23 01:02:40.482560672 +0200
 @@ -10516,7 +10516,7 @@
  			PangoFontDescription *font_desc;
  			font_desc =
-- 
cgit v1.2.3