diff options
-rw-r--r-- | meta/classes/packaged-staging.bbclass | 3 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 48c55bc27c..ed94790b1d 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass | |||
@@ -19,9 +19,6 @@ PSTAGE_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_ | |||
19 | PSTAGE_PKGNAME = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk" | 19 | PSTAGE_PKGNAME = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk" |
20 | PSTAGE_PKG = "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}" | 20 | PSTAGE_PKG = "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}" |
21 | 21 | ||
22 | # multimachine.bbclass will override this but add a default in case we're not using it | ||
23 | MULTIMACH_ARCH ?= "${PACKAGE_ARCH}" | ||
24 | |||
25 | PSTAGE_NATIVEDEPENDS = "\ | 22 | PSTAGE_NATIVEDEPENDS = "\ |
26 | shasum-native \ | 23 | shasum-native \ |
27 | stagemanager-native \ | 24 | stagemanager-native \ |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 697832acae..d51f9d9e78 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -91,6 +91,7 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" | |||
91 | MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" | 91 | MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" |
92 | PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" | 92 | PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" |
93 | 93 | ||
94 | MULTIMACH_ARCH = "${PACKAGE_ARCH}" | ||
94 | MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" | 95 | MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" |
95 | MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" | 96 | MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" |
96 | 97 | ||