summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndrey Zhizhikin <andrey.z@gmail.com>2020-07-01 14:58:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-16 21:28:40 (GMT)
commite531b16b658cd97c1f03254735dd7e3e27708deb (patch)
treea45cdedb1a9bea0655340925567d8903885ed5a1 /meta
parent5e83c131e502324a2dba128ad642561261f55206 (diff)
downloadpoky-e531b16b658cd97c1f03254735dd7e3e27708deb.tar.gz
kernel/yocto: fix search for defconfig from src_uri
Fetcher provides full paths to defconfig and scc files, which awk comparison operator does not catch during construction of src_uri_defconfig and sccs_from_src_uri lists. This causes the src_uri_defconfig variable to come out empty, and fails further validation if defconfig is only supplied via SRC_URI. Replace comparison operator with awk match function which searches for sub-string during filtering, effectively placing defconfig from SRC_URI into src_uri_defconfig and scc files in sccs_from_src_uri respectively. Fixes: 23dcff0d396c (kernel/yocto: ensure that defconfigs are processed first) Cc: Bruce Ashfield <bruce.ashfield@gmail.com> (From OE-Core rev: 11089e06bfb3d0defb52825ffba978d085385569) Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f52ce0fa98bf3bd72df7467031001f3128c145f2) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-yocto.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 41d8620..54a1a16 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -156,9 +156,10 @@ do_kernel_metadata() {
156 # a quick check to make sure we don't have duplicate defconfigs If 156 # a quick check to make sure we don't have duplicate defconfigs If
157 # there's a defconfig in the SRC_URI, did we also have one from the 157 # there's a defconfig in the SRC_URI, did we also have one from the
158 # KBUILD_DEFCONFIG processing above ? 158 # KBUILD_DEFCONFIG processing above ?
159 src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ') 159 src_uri_defconfig=$(echo $sccs_from_src_uri | awk '(match($0, "defconfig") != 0) { print $0 }' RS=' ')
160 # drop and defconfig's from the src_uri variable, we captured it just above here if it existed 160 # drop and defconfig's from the src_uri variable, we captured it just above here if it existed
161 sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ') 161 sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '(match($0, "defconfig") == 0) { print $0 }' RS=' ')
162
162 if [ -n "$in_tree_defconfig" ]; then 163 if [ -n "$in_tree_defconfig" ]; then
163 sccs_defconfig=$in_tree_defconfig 164 sccs_defconfig=$in_tree_defconfig
164 if [ -n "$src_uri_defconfig" ]; then 165 if [ -n "$src_uri_defconfig" ]; then