summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib.bbclass
diff options
context:
space:
mode:
authorPetter Mab├Ącker <petter@technux.se>2017-05-15 06:17:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-23 11:43:38 +0100
commit30238852a53d221ebcaa5b2dc30ea9617c2715a1 (patch)
tree45c9226f4e46f8342140984e0461592ed5bea4af /meta/classes/multilib.bbclass
parentd1120849e12c46aa46b02905a3f43c0853bd11a0 (diff)
downloadopenembedded-core-30238852a53d221ebcaa5b2dc30ea9617c2715a1.tar.gz
openembedded-core-30238852a53d221ebcaa5b2dc30ea9617c2715a1.tar.bz2
openembedded-core-30238852a53d221ebcaa5b2dc30ea9617c2715a1.zip
multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR
Due to the problem fixed in '56c677a multilib: Move redefinition of STAGING_DIR_KERNEL' STAGING_KERNEL_DIR must be redefined for lib32 in multilib.bbclass. However this redefinition expanded STAGING_KERNEL_DIR to an absolute path. This unconsciously added the TMPDIR path in the sstate object, causing packages depended on STAGING_KERNEL_DIR being rebuild if the TMPDIR was changed. Solve this by forcing the unexpanded TMPDIR variable to remain in the beginning of STAGING_DIR_KERNEL (as default). Since TMPDIR is included in BB_HASHBASE_WHITELIST, the sstate object will not be depended on the expanded path anymore. Signed-off-by: Petter Mab├Ącker <petter@technux.se> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/multilib.bbclass')
-rw-r--r--meta/classes/multilib.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index ab04597f93..816f54e7f5 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -4,7 +4,9 @@ python multilib_virtclass_handler () {
if cls != "multilib" or not variant:
return
- e.data.setVar('STAGING_KERNEL_DIR', e.data.getVar('STAGING_KERNEL_DIR'))
+ localdata = bb.data.createCopy(e.data)
+ localdata.delVar('TMPDIR')
+ e.data.setVar('STAGING_KERNEL_DIR', localdata.getVar('STAGING_KERNEL_DIR'))
# There should only be one kernel in multilib configs
# We also skip multilib setup for module packages.