Setting WORKDIR in the kernel recipes if KERNEL_PACKAGE_NAME changes to the WORKDIR of the recipe leads to other recipes such as perf and make-mod-scripts build errors. As they rely on globally set variables to determine the location of the kernel-source.
Commit also removes KERNEL_PACKAGE_NAME variable as it's set globally in bitbake.conf. Signed-off-by: Vincent Davis Jr <[email protected]> --- meta/classes-recipe/kernel.bbclass | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 48e394b650..d8d44de27b 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -12,7 +12,6 @@ COMPATIBLE_HOST = ".*-linux" REQUIRED_TUNE_FEATURES:riscv32 = "rv 32 i m a zicsr zifencei" REQUIRED_TUNE_FEATURES:riscv64 = "rv 64 i m a zicsr zifencei" -KERNEL_PACKAGE_NAME ??= "kernel" KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }" PROVIDES += "virtual/kernel" @@ -67,18 +66,6 @@ python __anonymous () { bb.warn("Some packages (E.g. *-dev) might be missing due to " "bug 11905 (variable KERNEL_PACKAGE_NAME == PN)") - # The default kernel recipe builds in a shared location defined by - # bitbake/distro confs: STAGING_KERNEL_DIR and STAGING_KERNEL_BUILDDIR. - # Set these variables to directories under ${WORKDIR} in alternate - # kernel recipes (I.e. where KERNEL_PACKAGE_NAME != kernel) so that they - # may build in parallel with the default kernel without clobbering. - if kpn != "kernel": - workdir = d.getVar("WORKDIR") - sourceDir = os.path.join(workdir, 'kernel-source') - artifactsDir = os.path.join(workdir, 'kernel-build-artifacts') - d.setVar("STAGING_KERNEL_DIR", sourceDir) - d.setVar("STAGING_KERNEL_BUILDDIR", artifactsDir) - # Merge KERNEL_IMAGETYPE and KERNEL_ALT_IMAGETYPE into KERNEL_IMAGETYPES type = d.getVar('KERNEL_IMAGETYPE') or "" alttype = d.getVar('KERNEL_ALT_IMAGETYPE') or "" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#240792): https://lists.openembedded.org/g/openembedded-core/message/240792 Mute This Topic: https://lists.openembedded.org/mt/120238089/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
