Skip to contentSkip to conversation

kernel-yocto: account for extracted defconfig in elements check

PATCH Bruce Ashfield 2 participants 2 messages Jul 23, 2020 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Adding oe-core, since that's where this would be noticed (and is the right list for it).

Steve: this change is good for backpor, and puts everything back to a working state, the bug this fixes only came in after the initial fixes had gone to dunfell.

Bruce

Quoted 49 lines · Gary Bisson

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 -2
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}
--

2.27.0

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#2 lore raw
Quoted 7 lines · Bruce Ashfield

Adding oe-core, since that's where this would be noticed (and is the right list for it).

Steve: this change is good for backpor, and puts everything back to a working state, the bug this fixes only came in after the initial fixes had gone to dunfell.

I already pulled thin into stable/dunfell-nut for testing, but we should probably pull it into the upcoming dunfell 3.1.2 release!

Richard: If you are going to kick off the release build could you pull in this patch? If you aren't going to the build yet I'll send a pull request tomorrow morning.

Steve

Quoted 58 lines
Quoted 47 lines · Gary Bisson

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 -2
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}
--
Quoted 2 lines

2.27.0

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II