summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-03 21:09:40 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-04 11:43:12 +0100
commitf6ae8a4b3e4470dad62941e4902205b76c7e0bc1 (patch)
tree023e5d21cd73b39d37726b079f368a6045bfea5d /meta
parentec8f5299d96d938b56c68d4ffa701b0c8a061de6 (diff)
downloadpoky-f6ae8a4b3e4470dad62941e4902205b76c7e0bc1.tar.gz
packaged-staging: Fix architecture of nativesdk and cross-canadian packages. Also remove now unneeded path from native packages
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/packaged-staging.bbclass15
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 08e04448aa..1ea5718699 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -29,18 +29,19 @@ BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}"
29 29
30python () { 30python () {
31 if bb.data.inherits_class('native', d): 31 if bb.data.inherits_class('native', d):
32 bb.data.setVar('PSTAGE_PKGARCH', bb.data.getVar('BUILD_ARCH', d), d) 32 bb.data.setVar('PSTAGE_PKGARCH', bb.data.getVar('BUILD_ARCH', d), d)
33 elif bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d): 33 elif bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d):
34 bb.data.setVar('PSTAGE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TARGET_ARCH}", d), d) 34 bb.data.setVar('PSTAGE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TARGET_ARCH}", d), d)
35 elif bb.data.inherits_class('nativesdk', d):
36 bb.data.setVar('PSTAGE_PKGARCH', bb.data.expand("${SDK_ARCH}", d), d)
37 elif bb.data.inherits_class('cross-canadian', d):
38 bb.data.setVar('PSTAGE_PKGARCH', bb.data.expand("${SDK_ARCH}_${TARGET_ARCH}", d), d)
35 39
36 pstage_allowed = True 40 pstage_allowed = True
37 41
38 # These classes encode staging paths into the binary data so can only be 42 # These classes encode staging paths into their scripts data so can only be
39 # reused if the path doesn't change/ 43 # reused if we manipulate the paths
40 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d): 44 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d):
41 path = bb.data.getVar('PSTAGE_PKGPATH', d, 1)
42 path = path + bb.data.getVar('TMPDIR', d, 1).replace('/', '-')
43 bb.data.setVar('PSTAGE_PKGPATH', path, d)
44 scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMPDIR_STAGE}" 45 scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMPDIR_STAGE}"
45 bb.data.setVar('PSTAGE_SCAN_CMD', scan_cmd, d) 46 bb.data.setVar('PSTAGE_SCAN_CMD', scan_cmd, d)
46 47