mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
multilib_global.bbclass: fix parsing error with no kernel module split
The problem could be reproduced with the following settings: MACHINE = "qemux86-64" KERNEL_SPLIT_MODULES = "0" require conf/multilib.conf MULTILIBS ?= "multilib:lib32" DEFAULTTUNE:virtclass-multilib-lib32 ?= "core2-32" The error message is as below: bb.data_smart.ExpansionError: Failure expanding variable KERNEL_VERSION_PKG_NAME, expression was ${@legitimize_package_name(d.getVar('KERNEL_VERSION'))} which triggered exception TypeError: expected string or bytes-like object The variable dependency chain for the failure is: KERNEL_VERSION_PKG_NAME -> RPROVIDES:kernel-modules This is because multilib_virtclass_handler_global function in multilib_global.bbclass deletes KERNEL_VERSION. So we need to handle such situation. We'll also need to delete KERNEL_VERSION_PKG_NAME to avoid this parsing error. (From OE-Core rev: 43dd497bc161ac44faecfdff052db03679dbb4f8) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b0b9d8768a
commit
6cc6246fd0
|
@ -195,6 +195,7 @@ python multilib_virtclass_handler_global () {
|
|||
# from a copy of the datastore
|
||||
localdata = bb.data.createCopy(d)
|
||||
localdata.delVar("KERNEL_VERSION")
|
||||
localdata.delVar("KERNEL_VERSION_PKG_NAME")
|
||||
|
||||
variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user