diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-09-29 19:19:14 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 11:15:46 +0100 |
| commit | 6bd87edc383b40e300b0ef4bf851c39b698305cd (patch) | |
| tree | 579488575678bf7e41c69b908eed3620955ceebd | |
| parent | acc988272b4e74a9ad1e6da5af5b2d208584197b (diff) | |
| download | openembedded-core-6bd87edc383b40e300b0ef4bf851c39b698305cd.tar.gz openembedded-core-6bd87edc383b40e300b0ef4bf851c39b698305cd.tar.bz2 openembedded-core-6bd87edc383b40e300b0ef4bf851c39b698305cd.zip | |
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.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/multilib.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/multilib.conf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 76cbac6d6a..f162293da2 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 ea5ed71a99..b22a4cb964 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}" |