summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-04-14 11:03:43 +0100
committerJoshua Lock <josh@linux.intel.com>2010-04-27 16:58:42 +0100
commite866ea68c7cd3e4f17c60e0952dd2a66ee94c65a (patch)
treeca5fe83894cdc19adf7fb57fe165cadc9164b499 /meta
parent6727d5ad6c45737cf176f17c23a5891daa73f9b1 (diff)
downloadpoky-e866ea68c7cd3e4f17c60e0952dd2a66ee94c65a.tar.gz
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')
-rw-r--r--meta/classes/packaged-staging.bbclass7
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 @@
12# bitbake.conf set PSTAGING_ACTIVE = "0", this class sets to "1" if we're active 12# bitbake.conf set PSTAGING_ACTIVE = "0", this class sets to "1" if we're active
13# 13#
14PSTAGE_PKGVERSION = "${PV}-${PR}" 14PSTAGE_PKGVERSION = "${PV}-${PR}"
15PSTAGE_PKGARCH = "${BUILD_SYS}" 15PSTAGE_PKGARCH = "${TARGET_ARCH}"
16PSTAGE_EXTRAPATH ?= "" 16PSTAGE_EXTRAPATH ?= ""
17PSTAGE_PKGPATH = "${DISTRO}/${OELAYOUT_ABI}${PSTAGE_EXTRAPATH}" 17PSTAGE_PKGPATH = "${DISTRO}/${OELAYOUT_ABI}${PSTAGE_EXTRAPATH}"
18PSTAGE_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d).replace('_', '-')}" 18PSTAGE_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d).replace('_', '-')}"
@@ -29,6 +29,11 @@ PSTAGE_NATIVEDEPENDS = "\
29BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" 29BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}"
30 30
31python () { 31python () {
32 if bb.data.inherits_class('native', d):
33 bb.data.setVar('PSTAGE_PKGARCH', bb.data.getVar('BUILD_ARCH', d), d)
34 elif bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d):
35 bb.data.setVar('PSTAGE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TARGET_ARCH}", d), d)
36
32 pstage_allowed = True 37 pstage_allowed = True
33 38
34 # These classes encode staging paths into the binary data so can only be 39 # These classes encode staging paths into the binary data so can only be