From 6a7549ff000ec697d1ec30242d4aca1ee47307c5 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 10 Jun 2010 11:29:09 +0100 Subject: 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 --- meta/classes/packaged-staging.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 9ae16f1932..6314e36aa7 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 -- cgit v1.2.3-54-g00ecf