summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-09-30 00:19:14 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 10:40:50 (GMT)
commit56c677a338493cca90c1524a04376f21abba2733 (patch)
treed00e35578f7ec92b2e57fd797d06a81c5e02f5c3
parentcf7cff7d2306f83847609d369477984dc8e31cdd (diff)
downloadpoky-56c677a338493cca90c1524a04376f21abba2733.tar.gz
multilib: Move redefinition of STAGING_DIR_KERNEL
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. (From OE-Core rev: 6bd87edc383b40e300b0ef4bf851c39b698305cd) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/multilib.bbclass2
-rw-r--r--meta/conf/multilib.conf1
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 76cbac6..f162293 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -7,6 +7,8 @@ python multilib_virtclass_handler () {
7 if cls != "multilib" or not variant: 7 if cls != "multilib" or not variant:
8 return 8 return
9 9
10 e.data.setVar('STAGING_KERNEL_DIR', e.data.getVar('STAGING_KERNEL_DIR', True))
11
10 # There should only be one kernel in multilib configs 12 # There should only be one kernel in multilib configs
11 if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data): 13 if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
12 raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel") 14 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"
6 6
7MULTILIBS ??= "multilib:lib32" 7MULTILIBS ??= "multilib:lib32"
8 8
9STAGING_KERNEL_DIR := "${STAGING_KERNEL_DIR}"
10STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" 9STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
11STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" 10STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}"
12 11