summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-07-17 12:56:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-23 15:51:07 (GMT)
commit569b1f5d67c57de957e243997c53ec2f81dc8dfe (patch)
tree4570aec1705c13922dec642f9b31c2d235526f32
parentd2bbfc42b7728debae89eb84bb53e1a95714ccb5 (diff)
downloadpoky-569b1f5d67c57de957e243997c53ec2f81dc8dfe.tar.gz
kernel-yocto: account for extracted defconfig in elements checkyocto-3.1.2dunfell-23.0.2
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: ea886d57db917a41a0d106a15e1e96c72d6407b0) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 3a95e171d3eaa6ab143d4f422c98a0ac7ad31761) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 54a1a16..3311f6e 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}