[oe-commits] org.oe.dev Add ability to find the directory of parent package if the child package

[john_lee commit]

Add ability to find the directory of parent package if the child package
is of different arch.

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: 6de03b1e10d4352235134bf9e8ddd26a833adb2b
ViewMTN: http://monotone.openembedded.org/revision/info/6de03b1e10d4352235134bf9e8ddd26a833adb2b
Files:
1
packages/meta/meta-toolchain.bb
Diffs:

#
# mt diff -ra2980faec6af41b091ae78940010ed6e9a734ec2 -r6de03b1e10d4352235134bf9e8ddd26a833adb2b
#
#
#
# patch "packages/meta/meta-toolchain.bb"
#  from [3fe2673a61b591aed4f247f8201896a640d5ed35]
#    to [1d7f7fa150b6ea85e6e714cf2ce2f15e6ef9a599]
#
============================================================
--- packages/meta/meta-toolchain.bb	3fe2673a61b591aed4f247f8201896a640d5ed35
+++ packages/meta/meta-toolchain.bb	1d7f7fa150b6ea85e6e714cf2ce2f15e6ef9a599
@@ -1,6 +1,7 @@ DEPENDS = "ipkg-native ipkg-utils-native
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+PR = "r1"
 
 inherit sdk meta
 
@@ -59,8 +60,8 @@ do_populate_sdk() {
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
 
 	# remove unwanted housekeeping files
-	mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
-	rm -Rf ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg
+	mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	rm -Rf ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ipkg
 	mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
 	rm -Rf ${SDK_OUTPUT}/usr/lib
 
@@ -73,10 +74,17 @@ do_populate_sdk() {
 		for arch in $revipkgarchs; do
 			pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
 			if [ -e $pkgnames ]; then
-				echo "Found $pkgnames"
+				oenote "Found $pkgnames"
 				cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
 				orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
-				pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+				pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+				for aarch in $revipkgarchs; do
+					if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then
+						pkg_subdir="${aarch}${pkg_subdir_postfix}"
+						break
+					fi
+				done
+				oenote "Original package in ${pkg_subdir}"
 				mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
 				cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
 				subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-`