On Fri, Jul 3, 2020 at 9:15 PM S. Lockwood-Childs <[email protected]> wrote: > > Fix build failure in do_kernel_metadata > > do_kernel_metadata: Could not locate BSP definition for $MACHINE/standard > and no defconfig was provided > > The original awk statements looking for the current MACHINE's defconfig > expected to find an entry from SRC_URI that exactly matched 'defconfig'. > In fact, the actual defconfig entry in SRC_URI had been resolved to a > full path inside the working dir, e.g. '/path/to/workdir/defconfig' > > Instead of an exact match, use a looser criteria of matching (or not > matching) 'defconfig' as a word in the current record, which still works > if there is a path in front of it. This should achieve the intended > objective of splitting the list into defconfig and non-defconfig > entries.
We already have a patch on the list for this. Cheers, Bruce > > Signed-off-by: S. Lockwood-Childs <[email protected]> > --- > meta/classes/kernel-yocto.bbclass | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/kernel-yocto.bbclass > b/meta/classes/kernel-yocto.bbclass > index 41d8620e67..97d6f61850 100644 > --- a/meta/classes/kernel-yocto.bbclass > +++ b/meta/classes/kernel-yocto.bbclass > @@ -156,9 +156,9 @@ 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 '/\<defconfig\>/ { > 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 '!/\<defconfig\>/ { > print $0 }' RS=' ') > if [ -n "$in_tree_defconfig" ]; then > sccs_defconfig=$in_tree_defconfig > if [ -n "$src_uri_defconfig" ]; then > -- > 2.20.1 > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#140302): https://lists.openembedded.org/g/openembedded-core/message/140302 Mute This Topic: https://lists.openembedded.org/mt/75291377/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
