summaryrefslogtreecommitdiffstats
path: root/meta/classes/kernel-yocto.bbclass
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-07-17 08:56:33 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-20 08:37:38 +0100
commit8cbe99b64f6f6ee13f154760aed4aa0815a6dfac (patch)
tree886a2cbae60c84e43e99c2662531fa8151e0c2ae /meta/classes/kernel-yocto.bbclass
parent7f35800bcf3b7fb121d8df04f31d5086544c7173 (diff)
downloadpoky-8cbe99b64f6f6ee13f154760aed4aa0815a6dfac.tar.gz
kernel-yocto: account for extracted defconfig in elements check
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) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-yocto.bbclass')
-rw-r--r--meta/classes/kernel-yocto.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 54a1a1627a..3311f6e84e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -213,7 +213,7 @@ do_kernel_metadata() {
213 meta_dir=$(kgit --meta) 213 meta_dir=$(kgit --meta)
214 214
215 # run1: pull all the configuration fragments, no matter where they come from 215 # run1: pull all the configuration fragments, no matter where they come from
216 elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`" 216 elements="`echo -n ${bsp_definition} $sccs_defconfig ${sccs} ${patches} ${KERNEL_FEATURES}`"
217 if [ -n "${elements}" ]; then 217 if [ -n "${elements}" ]; then
218 echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition 218 echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
219 scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES} 219 scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}