diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-07-17 21:28:03 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-07-17 21:28:03 +0000 |
| commit | ba539abf0b9d663131302ae527c379ff57138dce (patch) | |
| tree | 9aed7abaf839dcfe21eb7cf01adc241381e93865 | |
| parent | 5b799cc33c5f71523cb860dd6fd233c1a3dd9ab5 (diff) | |
| download | openembedded-core-ba539abf0b9d663131302ae527c379ff57138dce.tar.gz openembedded-core-ba539abf0b9d663131302ae527c379ff57138dce.tar.bz2 openembedded-core-ba539abf0b9d663131302ae527c379ff57138dce.zip | |
bitbake.conf: Set MULTIMACH_ARCH to a default value
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4861 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -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_ PSTAGE_PKGNAME = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk" PSTAGE_PKG = "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}" -# multimachine.bbclass will override this but add a default in case we're not using it -MULTIMACH_ARCH ?= "${PACKAGE_ARCH}" - PSTAGE_NATIVEDEPENDS = "\ shasum-native \ 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}" MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" +MULTIMACH_ARCH = "${PACKAGE_ARCH}" MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" |