summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-06-10 11:29:09 +0100
committerJoshua Lock <josh@linux.intel.com>2010-06-10 11:36:23 +0100
commit6a7549ff000ec697d1ec30242d4aca1ee47307c5 (patch)
tree5fbf5f145358798385651e4b15d72e8fbb0a76ab /meta
parent8273262ae64d12bd03100d4312dd90964f2ade6f (diff)
downloadopenembedded-core-6a7549ff000ec697d1ec30242d4aca1ee47307c5.tar.gz
openembedded-core-6a7549ff000ec697d1ec30242d4aca1ee47307c5.tar.bz2
openembedded-core-6a7549ff000ec697d1ec30242d4aca1ee47307c5.tar.xz
openembedded-core-6a7549ff000ec697d1ec30242d4aca1ee47307c5.zip
packaged-staging.bbclass: Use a differnet opkg.conf for each TARGET_ARCH
Assembling an appropriate opkg.conf in the pstage_helper is difficult when building for multiple target architectures in one Poky directory, work around this by generating an appropriate opkg.conf for the TARGET_ARCH and using an ${TARGET_ARCH}-opkg.conf for packaged staging. Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/packaged-staging.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 9ae16f193..6314e36aa 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -78,7 +78,7 @@ python () {
bb.data.setVar("PSTAGING_ACTIVE", "0", d)
}
-PSTAGE_MACHCONFIG = "${PSTAGE_WORKDIR}/opkg.conf"
+PSTAGE_MACHCONFIG = "${PSTAGE_WORKDIR}/${TARGET_ARCH}-opkg.conf"
PSTAGE_PKGMANAGER = "stage-manager-ipkg"
@@ -148,11 +148,11 @@ do_clean_prepend() {
}
staging_helper () {
- # Assemble appropriate opkg.conf
+ # Assemble appropriate opkg.conf for the target arch
conffile=${PSTAGE_MACHCONFIG}
mkdir -p ${PSTAGE_WORKDIR}/pstaging_lists
if [ ! -e $conffile ]; then
- ipkgarchs="${BUILD_ARCH} ${BUILD_ARCH}_${TARGET_ARCH}"
+ ipkgarchs="${TARGET_ARCH} ${BUILD_ARCH} ${BUILD_ARCH}_${TARGET_ARCH}"
priority=1
for arch in $ipkgarchs; do
echo "arch $arch $priority" >> $conffile