From ce94e33aef1e4be8f7a47bb0a8eefbb49c5f0db7 Mon Sep 17 00:00:00 2001 From: Russ Dill Date: Wed, 20 Apr 2022 20:58:19 -0700 Subject: kernel-yocto.bbclass: Fixup do_kernel_configcheck usage of KMETA The do_kernel_configcheck task requires a meta directory, normally set by ${KMETA}. The meta directory is taken as a relative path from ${S}: outfile = "{}/{}/cfg/mismatch.txt".format( s, kmeta ) However, when checking for the presence of ${KMETA} the current working directory is searched. This will almost always fail and "kgit --meta" is used instead. If the user does have a path in their current working directory that matches the ${KMETA} variable but the path is not present within the kernel source directory, the build will fail if it tries to write config errors/ warnings to that path. If ${KMETA} is not set, the same problem exists with the hard-coded "meta" directory. Fix these issues by checking for ${KMETA} within ${S} rather than the current working directory. Additionally, drop the hardcoded backup directory "meta" as it hasn't been functioning and probably has no users (From OE-Core rev: f4a3e80a4a6f4f709d09940dcaf45b2b00654496) Signed-off-by: Russ Dill Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 1d5a8cdf29..4cb638864c 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -521,15 +521,15 @@ python do_config_analysis() { python do_kernel_configcheck() { import re, string, sys, subprocess - # if KMETA isn't set globally by a recipe using this routine, we need to - # set the default to 'meta'. Otherwise, kconf_check is not passed a valid - # meta-series for processing - kmeta = d.getVar("KMETA") or "meta" - if not os.path.exists(kmeta): - kmeta = subprocess.check_output(['kgit', '--meta'], cwd=d.getVar('S')).decode('utf-8').rstrip() - s = d.getVar('S') + # if KMETA isn't set globally by a recipe using this routine, use kgit to + # locate or create the meta directory. Otherwise, kconf_check is not + # passed a valid meta-series for processing + kmeta = d.getVar("KMETA") + if not kmeta or not os.path.exists('{}/{}'.format(s,kmeta)): + kmeta = subprocess.check_output(['kgit', '--meta'], cwd=d.getVar('S')).decode('utf-8').rstrip() + env = os.environ.copy() env['PATH'] = "%s:%s%s" % (d.getVar('PATH'), s, "/scripts/util/") env['LD'] = d.getVar('KERNEL_LD') -- cgit v1.2.3-54-g00ecf