diff mbox series

[dunfell] linux-yocto-rt/5.4: fixup -rt build breakage

Message ID 20220719034456.2312-1-bruce.ashfield@gmail.com
State New, archived
Headers show
Series [dunfell] linux-yocto-rt/5.4: fixup -rt build breakage | expand

Commit Message

Bruce Ashfield July 19, 2022, 3:44 a.m. UTC
From: Bruce Ashfield <bruce.ashfield@gmail.com>

Integrating the following commit(s) to linux-yocto/5.4:

    cc478e363cc3 rt: fixup random and irq/manage merge issues

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Denys Dmytriyenko July 19, 2022, 4:01 a.m. UTC | #1
On Mon, Jul 18, 2022 at 11:44:56PM -0400, Bruce Ashfield wrote:
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
> 
> Integrating the following commit(s) to linux-yocto/5.4:
> 
>     cc478e363cc3 rt: fixup random and irq/manage merge issues
> 
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ---
>  meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
> index 5bc1993cf2..fe75aee4da 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
> @@ -11,7 +11,7 @@ python () {
>          raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
>  }
>  
> -SRCREV_machine ?= "086bb7f7d2b47d654922e5cc526cc6274b28e319"

This does not match to what is currently in dunfell, so it won't apply:
https://git.openembedded.org/openembedded-core/tree/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb?h=dunfell#n14


> +SRCREV_machine ?= "cc478e363cc35064b58a871a4cc535aa973c5891"
>  SRCREV_meta ?= "aaaf9f090dfb3160154b24fbc2f9a6e669babc87"
>  
>  SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
> -- 
> 2.19.1
Bruce Ashfield July 19, 2022, 4:04 a.m. UTC | #2
On Tue, Jul 19, 2022 at 12:01 AM Denys Dmytriyenko <denis@denix.org> wrote:
>
> On Mon, Jul 18, 2022 at 11:44:56PM -0400, Bruce Ashfield wrote:
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > Integrating the following commit(s) to linux-yocto/5.4:
> >
> >     cc478e363cc3 rt: fixup random and irq/manage merge issues
> >
> > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > ---
> >  meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
> > index 5bc1993cf2..fe75aee4da 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
> > @@ -11,7 +11,7 @@ python () {
> >          raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
> >  }
> >
> > -SRCREV_machine ?= "086bb7f7d2b47d654922e5cc526cc6274b28e319"
>
> This does not match to what is currently in dunfell, so it won't apply:
> https://git.openembedded.org/openembedded-core/tree/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb?h=dunfell#n14
>

right. I have another -stable update pending for dunfell, that need to
be applied first. In my rush to get this change out, I forgot that!

I'll resend everything later this week, I'm off to other things for a few days.

Bruce

>
> > +SRCREV_machine ?= "cc478e363cc35064b58a871a4cc535aa973c5891"
> >  SRCREV_meta ?= "aaaf9f090dfb3160154b24fbc2f9a6e669babc87"
> >
> >  SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
> > --
> > 2.19.1
Steve Sakoman July 19, 2022, 4:31 p.m. UTC | #3
On Mon, Jul 18, 2022 at 6:04 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Tue, Jul 19, 2022 at 12:01 AM Denys Dmytriyenko <denis@denix.org> wrote:
> >
> > On Mon, Jul 18, 2022 at 11:44:56PM -0400, Bruce Ashfield wrote:
> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > >
> > > Integrating the following commit(s) to linux-yocto/5.4:
> > >
> > >     cc478e363cc3 rt: fixup random and irq/manage merge issues
> > >
> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > ---
> > >  meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
> > > index 5bc1993cf2..fe75aee4da 100644
> > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
> > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
> > > @@ -11,7 +11,7 @@ python () {
> > >          raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
> > >  }
> > >
> > > -SRCREV_machine ?= "086bb7f7d2b47d654922e5cc526cc6274b28e319"
> >
> > This does not match to what is currently in dunfell, so it won't apply:
> > https://git.openembedded.org/openembedded-core/tree/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb?h=dunfell#n14
> >
>
> right. I have another -stable update pending for dunfell, that need to
> be applied first. In my rush to get this change out, I forgot that!
>
> I'll resend everything later this week, I'm off to other things for a few days.

Perfect, the 3.1.18 build is scheduled for next Monday and I'd really
like to get this fix in.

Steve

> > > +SRCREV_machine ?= "cc478e363cc35064b58a871a4cc535aa973c5891"
> > >  SRCREV_meta ?= "aaaf9f090dfb3160154b24fbc2f9a6e669babc87"
> > >
> > >  SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
> > > --
> > > 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 (#168271): https://lists.openembedded.org/g/openembedded-core/message/168271
> Mute This Topic: https://lists.openembedded.org/mt/92476074/3617601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [sakoman@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 5bc1993cf2..fe75aee4da 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,7 +11,7 @@  python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "086bb7f7d2b47d654922e5cc526cc6274b28e319"
+SRCREV_machine ?= "cc478e363cc35064b58a871a4cc535aa973c5891"
 SRCREV_meta ?= "aaaf9f090dfb3160154b24fbc2f9a6e669babc87"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \