[oe-commits] org.oe.dev merge of '8f416f1cd7eff65f0a75eb6db80cd5f7291ad959'

[xora commit]

merge of '8f416f1cd7eff65f0a75eb6db80cd5f7291ad959'
     and '951d47515dbbef9738cdf3e9159a0e58597f3608'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 46876c0e449d95a41520ddd3b4b694e1d919dd4b
ViewMTN: http://monotone.openembedded.org/revision/info/46876c0e449d95a41520ddd3b4b694e1d919dd4b
Files:
1
packages/meta/meta-toolchain.bb
packages/openmoko2/openmoko-common2_svn.bb
packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
packages/uboot/files/makefile-no-dirafter.patch
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
Diffs:

#
# mt diff -r8f416f1cd7eff65f0a75eb6db80cd5f7291ad959 -r46876c0e449d95a41520ddd3b4b694e1d919dd4b
#
# 
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [f3869892e4ec081f70f4d0a1f766a5286aa9731b]
#    to [87c750d8d98af38e8402202979fe105e03ca6e35]
# 
# patch "packages/openmoko2/openmoko-common2_svn.bb"
#  from [2b1fc081aed526f2c6bb9e9e643576153e9b7a10]
#    to [61a1a56981b35980d765c27ef65f8fcc84785e39]
# 
============================================================
--- packages/meta/meta-toolchain.bb	f3869892e4ec081f70f4d0a1f766a5286aa9731b
+++ packages/meta/meta-toolchain.bb	87c750d8d98af38e8402202979fe105e03ca6e35
@@ -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 .
 }
============================================================
--- packages/openmoko2/openmoko-common2_svn.bb	2b1fc081aed526f2c6bb9e9e643576153e9b7a10
+++ packages/openmoko2/openmoko-common2_svn.bb	61a1a56981b35980d765c27ef65f8fcc84785e39
@@ -1,21 +1,19 @@ PV = "0.0+svnr${SRCREV}"
 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"


#
# mt diff -r951d47515dbbef9738cdf3e9159a0e58597f3608 -r46876c0e449d95a41520ddd3b4b694e1d919dd4b
#
# 
# 
# rename "packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch"
#     to "packages/uboot/files/makefile-no-dirafter.patch"
# 
# patch "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
#  from [d3999509e6f8e1b8cbcd12aafad259da103400de]
#    to [0c0171c90503926242288f89cf359ffc1a9f7b2c]
# 
============================================================
--- packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb	d3999509e6f8e1b8cbcd12aafad259da103400de
+++ packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb	0c0171c90503926242288f89cf359ffc1a9f7b2c
@@ -19,6 +19,7 @@ SRC_URI = "\
   svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
   file://uboot-eabi-fix-HACK.patch \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+  file://makefile-no-dirafter.patch;patch=1 \
 "
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"