summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--classes/cross.bbclass2
-rw-r--r--classes/packaged-staging.bbclass3
2 files changed, 1 insertions, 4 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 75b2abe244..db86192e05 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -1,4 +1,4 @@
-# Disabled for now since the relocation paths are too long
+# We want cross packages to be relocatable
inherit relocatable
# Cross packages are built indirectly via dependency,
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index fda143188e..9f369485b5 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -40,9 +40,6 @@ python () {
# These classes encode staging paths into the binary data so can only be
# reused if the path doesn't change/
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):
- path = bb.data.getVar('PSTAGE_PKGPATH', d, 1)
- path = path + bb.data.getVar('TMPDIR', d, 1).replace('/', '-')
- bb.data.setVar('PSTAGE_PKGPATH', path, d)
scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMPDIR_STAGE}"
bb.data.setVar('PSTAGE_SCAN_CMD', scan_cmd, d)