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>
This commit is contained in:
parent
cf7cff7d23
commit
56c677a338
|
@ -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")
|
||||
|
|
|
@ -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}"
|
||||
|
||||
|
|
Loading…
Reference in New Issue