From 55ec32968137f363271fe104479d0c534446bdb8 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 29 Sep 2012 19:19:14 -0500 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- meta/classes/multilib.bbclass | 2 ++ meta/conf/multilib.conf | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) 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 () { 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}" -- 2.7.4