Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH] kernel/yocto: fix search for defconfig from src_uri
@ 2020-07-01 10:46 Andrey Zhizhikin
  2020-07-01 12:58 ` Bruce Ashfield
  0 siblings, 1 reply; 7+ messages in thread
From: Andrey Zhizhikin @ 2020-07-01 10:46 UTC (permalink / raw)
  To: openembedded-core; +Cc: Andrey Zhizhikin, Bruce Ashfield

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 index 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>
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
---
 meta/classes/kernel-yocto.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 41d8620e67..059d78b7dc 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -156,9 +156,10 @@ do_kernel_metadata() {
 	# a quick check to make sure we don't have duplicate defconfigs If
 	# there's a defconfig in the SRC_URI, did we also have one from the
 	# KBUILD_DEFCONFIG processing above ?
-	src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
+	src_uri_defconfig=$(echo $sccs_from_src_uri | awk '(index($0, "defconfig") != 0) { print $0 }' RS=' ')
 	# drop and defconfig's from the src_uri variable, we captured it just above here if it existed
-	sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
+	sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '(index($0, "defconfig") == 0) { print $0 }' RS=' ')
+
 	if [ -n "$in_tree_defconfig" ]; then
 		sccs_defconfig=$in_tree_defconfig
 		if [ -n "$src_uri_defconfig" ]; then
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-07-01 15:00 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-01 10:46 [PATCH] kernel/yocto: fix search for defconfig from src_uri Andrey Zhizhikin
2020-07-01 12:58 ` Bruce Ashfield
2020-07-01 13:01   ` Bruce Ashfield
     [not found]   ` <161DA278CF8B94DF.27211@lists.openembedded.org>
2020-07-01 13:26     ` [OE-core] " Bruce Ashfield
2020-07-01 13:32       ` Bruce Ashfield
2020-07-01 14:47         ` Andrey Zhizhikin
     [not found]         ` <161DA84312E53E76.3055@lists.openembedded.org>
2020-07-01 15:00           ` Andrey Zhizhikin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox