diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-04-14 11:03:43 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-04-27 16:58:42 +0100 |
| commit | e866ea68c7cd3e4f17c60e0952dd2a66ee94c65a (patch) | |
| tree | ca5fe83894cdc19adf7fb57fe165cadc9164b499 /meta/classes | |
| parent | 6727d5ad6c45737cf176f17c23a5891daa73f9b1 (diff) | |
| download | openembedded-core-e866ea68c7cd3e4f17c60e0952dd2a66ee94c65a.tar.gz openembedded-core-e866ea68c7cd3e4f17c60e0952dd2a66ee94c65a.tar.bz2 openembedded-core-e866ea68c7cd3e4f17c60e0952dd2a66ee94c65a.zip | |
packaged-staging.bbclass: Fix architecture field
The packages architecture field is incorrect, this patch changes it to:
native - build machine architecture
cross - build and target machine architectures
target - target machine architecture
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/packaged-staging.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 0c3feb8dd9..a04c956c80 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass @@ -12,7 +12,7 @@ # bitbake.conf set PSTAGING_ACTIVE = "0", this class sets to "1" if we're active # PSTAGE_PKGVERSION = "${PV}-${PR}" -PSTAGE_PKGARCH = "${BUILD_SYS}" +PSTAGE_PKGARCH = "${TARGET_ARCH}" PSTAGE_EXTRAPATH ?= "" PSTAGE_PKGPATH = "${DISTRO}/${OELAYOUT_ABI}${PSTAGE_EXTRAPATH}" PSTAGE_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d).replace('_', '-')}" @@ -29,6 +29,11 @@ PSTAGE_NATIVEDEPENDS = "\ BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" python () { + if bb.data.inherits_class('native', d): + bb.data.setVar('PSTAGE_PKGARCH', bb.data.getVar('BUILD_ARCH', d), d) + elif bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d): + bb.data.setVar('PSTAGE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TARGET_ARCH}", d), d) + pstage_allowed = True # These classes encode staging paths into the binary data so can only be |