diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/packaged-staging.bbclass | 6 |
1 files 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 () { | |||
78 | bb.data.setVar("PSTAGING_ACTIVE", "0", d) | 78 | bb.data.setVar("PSTAGING_ACTIVE", "0", d) |
79 | } | 79 | } |
80 | 80 | ||
81 | PSTAGE_MACHCONFIG = "${PSTAGE_WORKDIR}/opkg.conf" | 81 | PSTAGE_MACHCONFIG = "${PSTAGE_WORKDIR}/${TARGET_ARCH}-opkg.conf" |
82 | 82 | ||
83 | PSTAGE_PKGMANAGER = "stage-manager-ipkg" | 83 | PSTAGE_PKGMANAGER = "stage-manager-ipkg" |
84 | 84 | ||
@@ -148,11 +148,11 @@ do_clean_prepend() { | |||
148 | } | 148 | } |
149 | 149 | ||
150 | staging_helper () { | 150 | staging_helper () { |
151 | # Assemble appropriate opkg.conf | 151 | # Assemble appropriate opkg.conf for the target arch |
152 | conffile=${PSTAGE_MACHCONFIG} | 152 | conffile=${PSTAGE_MACHCONFIG} |
153 | mkdir -p ${PSTAGE_WORKDIR}/pstaging_lists | 153 | mkdir -p ${PSTAGE_WORKDIR}/pstaging_lists |
154 | if [ ! -e $conffile ]; then | 154 | if [ ! -e $conffile ]; then |
155 | ipkgarchs="${BUILD_ARCH} ${BUILD_ARCH}_${TARGET_ARCH}" | 155 | ipkgarchs="${TARGET_ARCH} ${BUILD_ARCH} ${BUILD_ARCH}_${TARGET_ARCH}" |
156 | priority=1 | 156 | priority=1 |
157 | for arch in $ipkgarchs; do | 157 | for arch in $ipkgarchs; do |
158 | echo "arch $arch $priority" >> $conffile | 158 | echo "arch $arch $priority" >> $conffile |