Skip to contentSkip to conversation

linux-yocto: Fix devupstream SRCREV assignment

PATCH In review Paul Barker 2 participants 3 messages Jul 20, 2021 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux-yocto: Fix devupstream SRCREV assignment

Fixes the following error when building linux-yocto-upstream:

Fetcher failure: Unable to find revision 570e7aedcd00e7e8a218e37c3dfb3b1fda83d111 in branch v5.13/base even from upstream

The error occurred as the SRCREV_machine assignment earlier in the recipe was being used instead of the mainline commit hash we want to use for linux-yocto-upstream.

---
 meta/recipes-kernel/linux/linux-yocto_5.13.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux/linux-yocto_5.13.bb +1 -1
index df385f912c..f43e738c69 100644
@@ -31,7 +31,7 @@ SRCREV_meta ?= "4dcaa4bcd042d398e210b702449dd35fdf9f0078"
 # normal PREFERRED_VERSION settings.
 BBCLASSEXTEND = "devupstream:target"
 DEFAULT_PREFERENCE_class-devupstream = "-1"
-SRCREV_class-devupstream ?= "f86aa267e180b23d8d24ee6886bd3bf9a360112e"
+SRCREV_machine_class-devupstream ?= "f86aa267e180b23d8d24ee6886bd3bf9a360112e"
 PN_class-devupstream = "linux-yocto-upstream"
 KBRANCH_class-devupstream = "v5.13/base"
 
Signature · 1 line
2.26.2
#1 lore raw
Quoted 10 lines · Paul Barker

Fixes the following error when building linux-yocto-upstream:

Fetcher failure: Unable to find revision 570e7aedcd00e7e8a218e37c3dfb3b1fda83d111 in branch v5.13/base even from upstream

The error occurred as the SRCREV_machine assignment earlier in the recipe was being used instead of the mainline commit hash we want to use for linux-yocto-upstream.

Odd that I didn't see this, since I've been using this heavily for a week. But I switched builders and I did trigger the same error.

One of my local development layers was clobbering the SRCREV format, so my assignment of SRCREV directly (versus machine) was working.

RP: Grab this one directly, I'll have more version bumps that will follow in not too long, but there's no sense waiting.

Bruce

Quoted 19 lines
---
 meta/recipes-kernel/linux/linux-yocto_5.13.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux/linux-yocto_5.13.bb +1 -2
index df385f912c..f43e738c69 100644
@@ -31,7 +31,7 @@ SRCREV_meta ?= "4dcaa4bcd042d398e210b702449dd35fdf9f0078"
 # normal PREFERRED_VERSION settings.
 BBCLASSEXTEND = "devupstream:target"
 DEFAULT_PREFERENCE_class-devupstream = "-1"
-SRCREV_class-devupstream ?= "f86aa267e180b23d8d24ee6886bd3bf9a360112e"
+SRCREV_machine_class-devupstream ?= "f86aa267e180b23d8d24ee6886bd3bf9a360112e"
 PN_class-devupstream = "linux-yocto-upstream"
 KBRANCH_class-devupstream = "v5.13/base"
 
--
Quoted 2 lines

2.26.2

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw
Quoted 13 lines · Bruce Ashfield via lists.openembedded.org
Quoted 10 lines · Paul Barker

Fixes the following error when building linux-yocto-upstream:

Fetcher failure: Unable to find revision 570e7aedcd00e7e8a218e37c3dfb3b1fda83d111 in branch v5.13/base even from upstream

The error occurred as the SRCREV_machine assignment earlier in the recipe was being used instead of the mainline commit hash we want to use for linux-yocto-upstream.

Quoted 8 lines

Odd that I didn't see this, since I've been using this heavily for a week. But I switched builders and I did trigger the same error.

One of my local development layers was clobbering the SRCREV format, so my assignment of SRCREV directly (versus machine) was working.

RP: Grab this one directly, I'll have more version bumps that will follow in not too long, but there's no sense waiting.

Actually, cancel that.

I just tested 5.13.4, and I'll put Paul's patch in my queue first, so my SRCREV update will follow it. It's easier if I send them both, since that way my version bump just applies.

Bruce

Quoted 34 lines

Bruce

Quoted 19 lines
---
 meta/recipes-kernel/linux/linux-yocto_5.13.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux/linux-yocto_5.13.bb +1 -2
index df385f912c..f43e738c69 100644
@@ -31,7 +31,7 @@ SRCREV_meta ?= "4dcaa4bcd042d398e210b702449dd35fdf9f0078"
 # normal PREFERRED_VERSION settings.
 BBCLASSEXTEND = "devupstream:target"
 DEFAULT_PREFERENCE_class-devupstream = "-1"
-SRCREV_class-devupstream ?= "f86aa267e180b23d8d24ee6886bd3bf9a360112e"
+SRCREV_machine_class-devupstream ?= "f86aa267e180b23d8d24ee6886bd3bf9a360112e"
 PN_class-devupstream = "linux-yocto-upstream"
 KBRANCH_class-devupstream = "v5.13/base"
 
--
Quoted 2 lines

2.26.2

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II