Message ID | 4079b14e4fccdf64f52b60c878fb22def0eae836.1710888915.git.bruce.ashfield@gmail.com |
---|---|
State | New |
Headers | show |
Series | [1/9] linux-yocto/6.6: cfg: generic arm64 | expand |
On Tue, 2024-03-19 at 19:01 -0400, bruce.ashfield@gmail.com wrote: > > diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend > index ca7b2b09df..bf88a57770 100644 > --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend > +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend > @@ -9,16 +9,16 @@ KMACHINE:genericx86-64 ?= "common-pc-64" > KMACHINE:beaglebone-yocto ?= "beaglebone" > > SRCREV_machine:genericarm64 ?= "e064a7d658a30b027b999183e21cd37305caff2a" > -SRCREV_machine:genericx86 ?= "332d4668fcc32826907d4f3c4938845206006089" > -SRCREV_machine:genericx86-64 ?= "332d4668fcc32826907d4f3c4938845206006089" > -SRCREV_machine:beaglebone-yocto ?= "332d4668fcc32826907d4f3c4938845206006089" > +SRCREV_machine:genericx86 ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" > +SRCREV_machine:genericx86-64 ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" > +SRCREV_machine:beaglebone-yocto ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" > > COMPATIBLE_MACHINE:genericarm64 = "genericarm64" > COMPATIBLE_MACHINE:genericx86 = "genericx86" > COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" > COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" > > -LINUX_VERSION:genericarm64 = "6.6.18" > -LINUX_VERSION:genericx86 = "6.6.15" > -LINUX_VERSION:genericx86-64 = "6.6.15" > -LINUX_VERSION:beaglebone-yocto = "6.6.15" > +LINUX_VERSION:genericarm64 = "6.6.21-116-g06644f0d7193" > +LINUX_VERSION:genericx86 = "6.6.21-116-g06644f0d7193" > +LINUX_VERSION:genericx86-64 = "6.6.21-116-g06644f0d7193" > +LINUX_VERSION:beaglebone-yocto = "6.6.21-116-g06644f0d7193" I think this one came through a little corrupted as it it doesn't rebase on top of the change Ross sent and even then, the LINUX_VERSION looks odd compared to the one set in the main recipe for that revision. I've tweaked it to look "right", we'll see how that build goes! Cheers, Richard
On Wed, Mar 20, 2024 at 6:47 AM Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > > On Tue, 2024-03-19 at 19:01 -0400, bruce.ashfield@gmail.com wrote: > > > > diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend > > index ca7b2b09df..bf88a57770 100644 > > --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend > > +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend > > @@ -9,16 +9,16 @@ KMACHINE:genericx86-64 ?= "common-pc-64" > > KMACHINE:beaglebone-yocto ?= "beaglebone" > > > > SRCREV_machine:genericarm64 ?= "e064a7d658a30b027b999183e21cd37305caff2a" > > -SRCREV_machine:genericx86 ?= "332d4668fcc32826907d4f3c4938845206006089" > > -SRCREV_machine:genericx86-64 ?= "332d4668fcc32826907d4f3c4938845206006089" > > -SRCREV_machine:beaglebone-yocto ?= "332d4668fcc32826907d4f3c4938845206006089" > > +SRCREV_machine:genericx86 ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" > > +SRCREV_machine:genericx86-64 ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" > > +SRCREV_machine:beaglebone-yocto ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" > > > > COMPATIBLE_MACHINE:genericarm64 = "genericarm64" > > COMPATIBLE_MACHINE:genericx86 = "genericx86" > > COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" > > COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" > > > > -LINUX_VERSION:genericarm64 = "6.6.18" > > -LINUX_VERSION:genericx86 = "6.6.15" > > -LINUX_VERSION:genericx86-64 = "6.6.15" > > -LINUX_VERSION:beaglebone-yocto = "6.6.15" > > +LINUX_VERSION:genericarm64 = "6.6.21-116-g06644f0d7193" > > +LINUX_VERSION:genericx86 = "6.6.21-116-g06644f0d7193" > > +LINUX_VERSION:genericx86-64 = "6.6.21-116-g06644f0d7193" > > +LINUX_VERSION:beaglebone-yocto = "6.6.21-116-g06644f0d7193" > > I think this one came through a little corrupted as it it doesn't > rebase on top of the change Ross sent and even then, the LINUX_VERSION > looks odd compared to the one set in the main recipe for that revision. > > I've tweaked it to look "right", we'll see how that build goes! > I was experimenting with my update script to pickup Kevin's commit shortlog and I noticed after that it was messing up the version string. I thought I rebased on top of the latest master (but that's probably the issue, I should have done master-next), so yes, it won't take into account us dropping genericarm64, etc. I've fixed my script now, so if you want a resend, I can easily do that. Bruce > Cheers, > > Richard
On Wed, 2024-03-20 at 08:29 -0400, Bruce Ashfield wrote: > On Wed, Mar 20, 2024 at 6:47 AM Richard Purdie > <richard.purdie@linuxfoundation.org> wrote: > > > > On Tue, 2024-03-19 at 19:01 -0400, bruce.ashfield@gmail.com wrote: > > > > > > diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux- > > > yocto_6.6.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux- > > > yocto_6.6.bbappend > > > index ca7b2b09df..bf88a57770 100644 > > > --- a/meta-yocto-bsp/recipes-kernel/linux/linux- > > > yocto_6.6.bbappend > > > +++ b/meta-yocto-bsp/recipes-kernel/linux/linux- > > > yocto_6.6.bbappend > > > @@ -9,16 +9,16 @@ KMACHINE:genericx86-64 ?= "common-pc-64" > > > KMACHINE:beaglebone-yocto ?= "beaglebone" > > > > > > SRCREV_machine:genericarm64 ?= > > > "e064a7d658a30b027b999183e21cd37305caff2a" > > > -SRCREV_machine:genericx86 ?= > > > "332d4668fcc32826907d4f3c4938845206006089" > > > -SRCREV_machine:genericx86-64 ?= > > > "332d4668fcc32826907d4f3c4938845206006089" > > > -SRCREV_machine:beaglebone-yocto ?= > > > "332d4668fcc32826907d4f3c4938845206006089" > > > +SRCREV_machine:genericx86 ?= > > > "06644f0d7193d7ec39d7fe41939a21953e7a0c65" > > > +SRCREV_machine:genericx86-64 ?= > > > "06644f0d7193d7ec39d7fe41939a21953e7a0c65" > > > +SRCREV_machine:beaglebone-yocto ?= > > > "06644f0d7193d7ec39d7fe41939a21953e7a0c65" > > > > > > COMPATIBLE_MACHINE:genericarm64 = "genericarm64" > > > COMPATIBLE_MACHINE:genericx86 = "genericx86" > > > COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" > > > COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" > > > > > > -LINUX_VERSION:genericarm64 = "6.6.18" > > > -LINUX_VERSION:genericx86 = "6.6.15" > > > -LINUX_VERSION:genericx86-64 = "6.6.15" > > > -LINUX_VERSION:beaglebone-yocto = "6.6.15" > > > +LINUX_VERSION:genericarm64 = "6.6.21-116-g06644f0d7193" > > > +LINUX_VERSION:genericx86 = "6.6.21-116-g06644f0d7193" > > > +LINUX_VERSION:genericx86-64 = "6.6.21-116-g06644f0d7193" > > > +LINUX_VERSION:beaglebone-yocto = "6.6.21-116-g06644f0d7193" > > > > I think this one came through a little corrupted as it it doesn't > > rebase on top of the change Ross sent and even then, the > > LINUX_VERSION > > looks odd compared to the one set in the main recipe for that > > revision. > > > > I've tweaked it to look "right", we'll see how that build goes! > > > > I was experimenting with my update script to pickup Kevin's commit shortlog > and I noticed after that it was messing up the version string. > > I thought I rebased on top of the latest master (but that's probably the issue, > I should have done master-next), so yes, it won't take into account us > dropping genericarm64, etc. > > I've fixed my script now, so if you want a resend, I can easily do that. Sorry, I'd not realised there were patches in master-next for meta- yocto, I thought I'd merged them. I've done that now and as the tweaked patch tested successfully, I've merged that too so we're all good. Thanks, Richard
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend index ca7b2b09df..bf88a57770 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend @@ -9,16 +9,16 @@ KMACHINE:genericx86-64 ?= "common-pc-64" KMACHINE:beaglebone-yocto ?= "beaglebone" SRCREV_machine:genericarm64 ?= "e064a7d658a30b027b999183e21cd37305caff2a" -SRCREV_machine:genericx86 ?= "332d4668fcc32826907d4f3c4938845206006089" -SRCREV_machine:genericx86-64 ?= "332d4668fcc32826907d4f3c4938845206006089" -SRCREV_machine:beaglebone-yocto ?= "332d4668fcc32826907d4f3c4938845206006089" +SRCREV_machine:genericx86 ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" +SRCREV_machine:genericx86-64 ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" +SRCREV_machine:beaglebone-yocto ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" COMPATIBLE_MACHINE:genericarm64 = "genericarm64" COMPATIBLE_MACHINE:genericx86 = "genericx86" COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" -LINUX_VERSION:genericarm64 = "6.6.18" -LINUX_VERSION:genericx86 = "6.6.15" -LINUX_VERSION:genericx86-64 = "6.6.15" -LINUX_VERSION:beaglebone-yocto = "6.6.15" +LINUX_VERSION:genericarm64 = "6.6.21-116-g06644f0d7193" +LINUX_VERSION:genericx86 = "6.6.21-116-g06644f0d7193" +LINUX_VERSION:genericx86-64 = "6.6.21-116-g06644f0d7193" +LINUX_VERSION:beaglebone-yocto = "6.6.21-116-g06644f0d7193"