From: Paul Barker <paul@pbarker.dev>
Date: Wed, 21 Jul 2021 03:21:37 +0000 (-0400)
Subject: linux-yocto: Fix devupstream SRCREV assignment
X-Git-Tag: uninative-3.3~197
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0df7954d1ffe111337bd7d68f0cb09404906db85;p=openembedded-core.git

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.

Signed-off-by: Paul Barker <paul@pbarker.dev>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-kernel/linux/linux-yocto_5.13.bb b/meta/recipes-kernel/linux/linux-yocto_5.13.bb
index df385f912c..f43e738c69 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.13.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.13.bb
@@ -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"