Skip to contentSkip to conversation

kernel-yocto: account for extracted defconfig in elements check

PATCH New Gary Bisson 1 participant 1 message Jul 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel-yocto: account for extracted defconfig in elements check

From: Bruce Ashfield <[email protected]>

The test for whether or not scc should to invoked to generate a config.queue was missing the newly created sccs_defconfig variable. We need to test for that variable as well, or we may miss generating the config.queue in some cases.

(From OE-Core rev: 3a95e171d3eaa6ab143d4f422c98a0ac7ad31761)

---
Hi,

I believe this patch log should also say:

Fixes 23dcff0d39 (kernel/yocto: ensure that defconfigs are processed first)

What I see on dunfell HEAD currently is that it's impossible to build my kernel (that uses KBUILD_DEFCONFIG) as the configme step fails because the config.queue in meta folder is not created.

Adding this patch on dunfell branch fixed the issue, hence this backport request.

Let me know if you have any questions.

Regards,
Gary

---
 meta/classes/kernel-yocto.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/kernel-yocto.bbclass +1 -1
index 54a1a1627a..3311f6e84e 100644
@@ -213,7 +213,7 @@ do_kernel_metadata() {
 	meta_dir=$(kgit --meta)
 
 	# run1: pull all the configuration fragments, no matter where they come from
-	elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
+	elements="`echo -n ${bsp_definition} $sccs_defconfig ${sccs} ${patches} ${KERNEL_FEATURES}`"
 	if [ -n "${elements}" ]; then
 		echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
 		scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
Signature · 1 line
2.27.0