uboot-config: fix devtool modify with kernel-fitimage
PATCH v2 1/3 uboot-config: fix devtool modify with kernel-fitimage
From: Adrian Freihofer <[email protected]>
How to reproduce:
- UBOOT_CONFIG must be used. With UBOOT_MACHINE it works fine. A simple example based on oe-core is to modify the beaglebone-yocto.conf file like this:
-UBOOT_MACHINE = "am335x_evm_defconfig"
+UBOOT_CONFIG = "foo"
+UBOOT_CONFIG[foo] = "am335x_evm_defconfig"
- A build configuration which inherits the kernel-fitimage.bbclass is needed. For example:
MACHINE = "beaglebone-yocto"
KERNEL_IMAGETYPE = "Image"
KERNEL_IMAGETYPES += " fitImage "
KERNEL_CLASSES = " kernel-fitimage "
devtool modify linux-yocto
devtool build linux-yocto
...
| cp: cannot stat '.../linux-yocto-6.6.21+git/am335x_evm_defconfig/.config':
No such file or directory
| WARNING: .../linux-yocto/6.6.21+git/temp/run.do_configure.2081673:172 exit 1
from 'cp .../linux-yocto-6.6.21+git/am335x_evm_defconfig/.config .../build/workspace/sources/linux-yocto/.config.baseline'
The reason for this problem is that the uboot-config.bbclass sets the variable KCONFIG_CONFIG_ROOTDIR to a path that makes sense for u-boot, but not for other recipes. However, the kernel-fitimage.bbclasse, for example, inherits the uboot-config.bbclass, which brings the u-boot-specific path into the kernel build context.
This change removes the uboot-specific KCONFIG_CONFIG_ROOTDIR path from recipes other than u-boot itself.
--- meta/classes-recipe/uboot-config.bbclass | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
meta/classes-recipe/uboot-config.bbclass +10 -7
@@ -101,12 +101,12 @@ python () { # The "doc" varflag is special, we don't want to see it here ubootconfigflags.pop('doc', None) ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split() + recipename = d.getVar("PN") if not ubootmachine and not ubootconfig: - PN = d.getVar("PN") FILE = os.path.basename(d.getVar("FILE")) bb.debug(1, "To build %s, see %s for instructions on \ - setting up your machine config" % (PN, FILE)) + setting up your machine config" % (recipename, FILE)) raise bb.parse.SkipRecipe("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE")) if ubootmachine and ubootconfig:
@@ -140,9 +140,12 @@ python () { if not found: raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys())) - if len(ubootconfig) == 1: - d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join(d.getVar("B"), d.getVar("UBOOT_MACHINE").strip())) - else: - # Disable menuconfig for multiple configs - d.setVar('KCONFIG_CONFIG_ENABLE_MENUCONFIG', "false") + # This recipe might be inherited e.g. by the kernel recipe via kernel-fitimage.bbclass + # Ensure the uboot specific menuconfig settings do not leak into other recipes + if 'u-boot' in recipename: + if len(ubootconfig) == 1: + d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join(d.getVar("B"), d.getVar("UBOOT_MACHINE").strip())) + else: + # Disable menuconfig for multiple configs + d.setVar('KCONFIG_CONFIG_ENABLE_MENUCONFIG', "false") }
Signature · 1 line
2.46.0
PATCH v2 2/3 devtool: modify kernel adds append twice
From: Adrian Freihofer <[email protected]>
Drop the redundant generation of the do_configure:append section for the kernel. The same append is generated twice:
if bb.data.inherits_class('kernel', rd):
f.write('\ndo_configure:append() {\n'
' cp ${B}/.config ${S}/.config.baseline\n'
' ln -sfT ${B}/.config ${S}/.config.new\n'
'}\n')KCONFIG_CONFIG_ENABLE_MENUCONFIG ??= "true"KCONFIG_CONFIG_ROOTDIR ??= "${B}"
if rd.getVarFlag('do_menuconfig', 'task'):
f.write('\ndo_configure:append() {\n'
' if [ ${@oe.types.boolean(d.getVar("KCONFIG_CONFIG_ENABLE_MENUCONFIG"))} = True ]; then\n'
' cp ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.baseline\n'
' ln -sfT ${KCONFIG_CONFIG_ROOTDIR}/.config ${S}/.config.new\n'
' fi\n'
'}\n')In contradiction to the first code block the second code block considers the variables which is correct.
--- scripts/lib/devtool/standard.py | 4 ---- 1 file changed, 4 deletions(-)
scripts/lib/devtool/standard.py +0 -4
@@ -955,10 +955,6 @@ def modify(args, config, basepath, workspace): f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' 'do_fetch do_unpack do_kernel_configcheck"\n') f.write('\ndo_patch[noexec] = "1"\n') - f.write('\ndo_configure:append() {\n' - ' cp ${B}/.config ${S}/.config.baseline\n' - ' ln -sfT ${B}/.config ${S}/.config.new\n' - '}\n') f.write('\ndo_kernel_configme:prepend() {\n' ' if [ -e ${S}/.config ]; then\n' ' mv ${S}/.config ${S}/.config.old\n'
Signature · 1 line
2.46.0
PATCH v2 3/3 devtool: remove obsolete SRCTREECOVEREDTASKS handling
In reply to Adrian FreihoferFrom: Adrian Freihofer <[email protected]>
devtool modify generates a bbappend for kernel recipes which contains:
SRCTREECOVEREDTASKS="\
do_fetch \
do_kernel_checkout \
do_kernel_configcheck \
do_unpack \
do_validate_branches \ "
do_patch[noexec] = "1"
If the linux-yocto kernel is used, this is redundant. The linux-yocto.bbclass already does the same:
linux-yocto sets SRCTREECOVEREDTASKS to
SRCTREECOVEREDTASKS="\
do_fetch \
do_kernel_checkout \
do_kernel_configcheck \
do_patch \
do_unpack \
do_validate_branches \"
Also the do_patch[noexec] is redundant because the purpose of SRCTREECOVEREDTASKS is to delete these tasks if the externalsrc.bbclass is used.
The default value of SRCTREECOVEREDTASKS initialized in externalsrc.bbclass is:
SRCTREECOVEREDTASKS ?= "do_patch do_unpack do_fetch"
This is fine for kernels which do not inherit the linux-yocto.bbclass.
The code in devtool modify is redundant and therefore removed.
--- scripts/lib/devtool/standard.py | 3 --- 1 file changed, 3 deletions(-)
scripts/lib/devtool/standard.py +0 -3
@@ -952,9 +952,6 @@ def modify(args, config, basepath, workspace): f.write('EXTERNALSRC_BUILD:pn-%s = "%s"\n' % (pn, srctree)) if bb.data.inherits_class('kernel', rd): - f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' - 'do_fetch do_unpack do_kernel_configcheck"\n') - f.write('\ndo_patch[noexec] = "1"\n') f.write('\ndo_kernel_configme:prepend() {\n' ' if [ -e ${S}/.config ]; then\n' ' mv ${S}/.config ${S}/.config.old\n'
Signature · 1 line
2.46.0