mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
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: 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>
This commit is contained in:
committed by
Richard Purdie
parent
d2bbfc42b7
commit
b329051137
@@ -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}
|
||||
|
||||
Reference in New Issue
Block a user