On Wed, Jul 1, 2020 at 11:22 AM Bruce Ashfield via
lists.openembedded.org
<bruce.ashfield=gmail....@lists.openembedded.org> wrote:
>
> On Wed, Jul 1, 2020 at 10:58 AM Andrey Zhizhikin <andre...@gmail.com> wrote:
> >
> > 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)
>
>
> v2 passes my testing as well. The autobuilder gets the final say, but
> I can't see this causing any issues.
>
Richard,
I didn't see this on master-next, and we got a different patch for
this on the list .. this is the preferred fix for readabilty.
I just wanted to make sure you weren't waiting for me to send it in my
next pull request. I can absolutely do that if you want.
Cheers,
Bruce
> Acked-by: Bruce Ashfield <bruce.ashfi...@gmail.com>
>
> > Cc: Bruce Ashfield <bruce.ashfi...@gmail.com>
> > Signed-off-by: Andrey Zhizhikin <andre...@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..54a1a1627a 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 '(match($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 '(match($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
> >
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
--
- 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 (#140304):
https://lists.openembedded.org/g/openembedded-core/message/140304
Mute This Topic: https://lists.openembedded.org/mt/75237251/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
