[08/12] multilib: Move redefinition of STAGING_DIR_KERNEL

Submitted by Mark Hatle on Sept. 30, 2012, 12:19 a.m.

Details

Message ID 7dc9277c4987b8e0278cfe958e7b2f56e2707a99.1348963477.git.mark.hatle@windriver.com
State Accepted
Commit 56c677a338493cca90c1524a04376f21abba2733
Headers show

Commit Message

Mark Hatle Sept. 30, 2012, 12:19 a.m.
If the STAGING_DIR_KERNEL is set in the multilib.conf, then it may be
set incorrected.  The evaluation happens before TMPDIR and LIBC are
defined in other components.

Moving the definition process to the multilib.bbclass ensures that
everything has been loaded before it is set.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/classes/multilib.bbclass |    2 ++
 meta/conf/multilib.conf       |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index fb03fca..8187e18 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -7,6 +7,8 @@  python multilib_virtclass_handler () {
     if cls != "multilib" or not variant:
         return
 
+    e.data.setVar('STAGING_KERNEL_DIR', e.data.getVar('STAGING_KERNEL_DIR', True))
+
     # There should only be one kernel in multilib configs
     if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
         raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index ea5ed71..b22a4cb 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -6,7 +6,6 @@  MULTILIB_SAVE_VARNAME = "DEFAULTTUNE"
 
 MULTILIBS ??= "multilib:lib32"
 
-STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"
 STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
 STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"