[oe-commits] org.oe.dev (Merge OM mtn modification back into mainline)

[john_lee commit]

(Merge OM mtn modification back into mainline)
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: 7b5a121460a4867fa930ed58cc8df78a6b2ba234
ViewMTN: http://monotone.openembedded.org/revision/info/7b5a121460a4867fa930ed58cc8df78a6b2ba234
Files:
1
packages/meta/meta-toolchain.bb
Diffs:

#
# mt diff -rb6fef700558a54d278519e7ee2a8665a9498a55f -r7b5a121460a4867fa930ed58cc8df78a6b2ba234
#
# 
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [b52d096ec913c333f9bb14b192bc922b80854834]
#    to [d53849cfd4dc2f21fcd44b4cc0926382313fc1e9]
# 
============================================================
--- packages/meta/meta-toolchain.bb	b52d096ec913c333f9bb14b192bc922b80854834
+++ packages/meta/meta-toolchain.bb	d53849cfd4dc2f21fcd44b4cc0926382313fc1e9
@@ -1,7 +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"
+PR = "r2"
 
 inherit sdk meta
 
@@ -75,10 +75,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-`