From 0410fbfe24f4afc65ef7859ae77ebb30ba0724bf Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 16 Oct 2007 13:50:16 +0000
Subject: meta-toolchain: only touch pkgconfig files if they're actually
 present

---
 packages/meta/meta-toolchain.bb | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index a734005819..261e9eac26 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -108,15 +108,18 @@ do_populate_sdk() {
 	rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
 
 	# fix pkgconfig data files
-	cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
-	for f in *.pc ; do
-		sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f"
-	done
-	for f in *.pc ; do
-		sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
-	done
-
-        mkdir -p ${SDK_DEPLOY}
+	if [ -e ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig ]; then
+		cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
+		for f in *.pc ; do
+			sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f"
+		done
+		for f in *.pc ; do
+			sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
+		done
+	fi
+	
+	# package it up
+	mkdir -p ${SDK_DEPLOY}
 	cd ${SDK_OUTPUT}
 	fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-toolchain.tar.bz2 .
 }
-- 
cgit v1.2.3


From 10dcd1969e8132ab4c1a10d58695d54f1b83fb1f Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 16 Oct 2007 14:03:00 +0000
Subject: openmoko-common2: remove pixmaps that ought to be part of
 openmoko-Xserver from here

---
 packages/openmoko2/openmoko-common2_svn.bb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index 0cf7f763cb..018f9a8e74 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,21 +1,19 @@
 DESCRIPTION = "Common files for the OpenMoko distribution"
 SECTION = "openmoko/base"
 PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r5"
 
 inherit openmoko2
 
 SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http"
 S = "${WORKDIR}"
 
+ALLOW_EMPTY = "1"
+
 dirs = "pixmaps"
 
 do_install() {
-	find ${WORKDIR} -name ".svn" | xargs rm -rf
-	install -d ${D}${datadir}
-	for i in ${dirs}; do
-		cp -fpPR ${S}/$i ${D}${datadir}
-	done
+	:
 }
 
 PACKAGE_ARCH = "all"
-- 
cgit v1.2.3