On Wed, Oct 6, 2021 at 7:05 AM Ross Burton <r...@burtonini.com> wrote:
>
> Can you drop this. Turns out in fixing it, I broke it more!
This particular commit has to stay, since all the -stable kernels are
stacked on top.
But I'll revert, merge it to the branches and send a new SRCREV update
that would follow the -stable bumps.
Bruce
>
> Ross
>
> On Wed, 6 Oct 2021 at 01:12, Bruce Ashfield <bruce.ashfi...@gmail.com> wrote:
> >
> > From: Bruce Ashfield <bruce.ashfi...@gmail.com>
> >
> > Integrating the following commit(s) to linux-yocto/5.14:
> >
> > 724df5812165 scripts/gcc-plugins: consistently use HOSTCC
> >
> > Signed-off-by: Bruce Ashfield <bruce.ashfi...@gmail.com>
> > ---
> > .../linux/linux-yocto-rt_5.14.bb | 4 ++--
> > .../linux/linux-yocto-tiny_5.14.bb | 6 ++---
> > meta/recipes-kernel/linux/linux-yocto_5.14.bb | 22 +++++++++----------
> > 3 files changed, 16 insertions(+), 16 deletions(-)
> >
> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
> > b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
> > index a147e632e4..06064706e0 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
> > @@ -11,8 +11,8 @@ python () {
> > raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel
> > to linux-yocto-rt to enable it")
> > }
> >
> > -SRCREV_machine ?= "7630ebb9fd510cf7aa31b6f1dd472f3b0442afb3"
> > -SRCREV_meta ?= "42d2cf670ed06f4dddd2a035611a519ea68e2d26"
> > +SRCREV_machine ?= "87e920626b63515458e304527509289993be2796"
> > +SRCREV_meta ?= "a1e3f40a0f4c5d05d1a6110a42d53eb3c3947ec8"
> >
> > SRC_URI =
> > "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
> >
> > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}"
> > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
> > b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
> > index 20ff40d267..699c8c7da0 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
> > @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
> > KMETA = "kernel-meta"
> > KCONF_BSP_AUDIT_LEVEL = "2"
> >
> > -SRCREV_machine:qemuarm ?= "ee2ccc84e65ade5ba0f8e1a700fba29a755746a1"
> > -SRCREV_machine ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818"
> > -SRCREV_meta ?= "42d2cf670ed06f4dddd2a035611a519ea68e2d26"
> > +SRCREV_machine:qemuarm ?= "f956536237159b85f94d70bb9e74b5894e6bf07d"
> > +SRCREV_machine ?= "724df5812165b61d20e93866be8f3e7e1e5e6b5c"
> > +SRCREV_meta ?= "a1e3f40a0f4c5d05d1a6110a42d53eb3c3947ec8"
> >
> > PV = "${LINUX_VERSION}+git${SRCPV}"
> >
> > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.14.bb
> > b/meta/recipes-kernel/linux/linux-yocto_5.14.bb
> > index 0c6fbff75e..809b6fa066 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto_5.14.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto_5.14.bb
> > @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.14/standard/base"
> > KBRANCH:qemux86-64 ?= "v5.14/standard/base"
> > KBRANCH:qemumips64 ?= "v5.14/standard/mti-malta64"
> >
> > -SRCREV_machine:qemuarm ?= "8226a3a65df2dbae0fe71e9ff54cba70a9ba85e5"
> > -SRCREV_machine:qemuarm64 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818"
> > -SRCREV_machine:qemumips ?= "b5389debd85300e24b877f25c2e90381f1df7678"
> > -SRCREV_machine:qemuppc ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818"
> > -SRCREV_machine:qemuriscv64 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818"
> > -SRCREV_machine:qemuriscv32 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818"
> > -SRCREV_machine:qemux86 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818"
> > -SRCREV_machine:qemux86-64 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818"
> > -SRCREV_machine:qemumips64 ?= "56cc67b699194944809832f4c8f58b9828f02bf9"
> > -SRCREV_machine ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818"
> > -SRCREV_meta ?= "42d2cf670ed06f4dddd2a035611a519ea68e2d26"
> > +SRCREV_machine:qemuarm ?= "139cd4a6ac01e83002011680d9fbb14048c1bc3a"
> > +SRCREV_machine:qemuarm64 ?= "724df5812165b61d20e93866be8f3e7e1e5e6b5c"
> > +SRCREV_machine:qemumips ?= "f5a73ebec6f028075220c690bbb121284313ebd3"
> > +SRCREV_machine:qemuppc ?= "724df5812165b61d20e93866be8f3e7e1e5e6b5c"
> > +SRCREV_machine:qemuriscv64 ?= "724df5812165b61d20e93866be8f3e7e1e5e6b5c"
> > +SRCREV_machine:qemuriscv32 ?= "724df5812165b61d20e93866be8f3e7e1e5e6b5c"
> > +SRCREV_machine:qemux86 ?= "724df5812165b61d20e93866be8f3e7e1e5e6b5c"
> > +SRCREV_machine:qemux86-64 ?= "724df5812165b61d20e93866be8f3e7e1e5e6b5c"
> > +SRCREV_machine:qemumips64 ?= "912fc3d0cf57239e6fe5030b82165b2d6f0632e3"
> > +SRCREV_machine ?= "724df5812165b61d20e93866be8f3e7e1e5e6b5c"
> > +SRCREV_meta ?= "a1e3f40a0f4c5d05d1a6110a42d53eb3c3947ec8"
> >
> > # set your preferred provider of linux-yocto to 'linux-yocto-upstream',
> > and you'll
> > # get the <version>/base branch, which is pure upstream -stable, and the
> > same
> > --
> > 2.19.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 (#156688):
https://lists.openembedded.org/g/openembedded-core/message/156688
Mute This Topic: https://lists.openembedded.org/mt/86108488/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
