At the moment, linux-yocto-dev is set up to reference v5.12-rt:

        mainline
           ---> stable-5.12
              ---> linux-rt-5.12
                 ---> linux-yocto-dev

We'll probably move to v5.13-rcN in late May and at that point we
can point it at referencing mainline directly while the respective
stable and -rt versions take shape, or perhaps create placeholders
in advance (as was just done for stable-5.12).

But the good thing is that we'll get v5.13-rcN via mainline, which is
already in the above chain, so we can take our time; there is no
pressure to reconsider the chaining of repos synchronously with the
kernel uprev.

And it is also constructive to consider the reverse case: where we are
pointing at mainline directly and a stable (or -rt) gets added/used.

        mainline
           ---> linux-yocto-dev

In this case, if linux-yocto-dev used a shiny new v5.13.1 stable,
without it yet being explicitly a part of the above chain, then the git
objects relating to that would simply flow from the server directly into
our linux-yocto-dev clone directly.  Nothing breaks or falls over.  So
there is no requirement to immediately react to creation of v5.13 stable
or preempt-rt recipes (even though they are trivial).

Signed-off-by: Paul Gortmaker <paul.gortma...@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-dev.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb 
b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index 8725473d1cd8..b4b91593aef8 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -19,7 +19,16 @@ include recipes-kernel/linux/linux-yocto-dev-revisions.inc
 KBRANCH = "standard/base"
 KMETA = "kernel-meta"
 
-SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \
+# When v5.13-rcN comes along, we can revector back to mainline
+#KREF = "git.kernel.org.torvalds.linux-master"
+#do_fetch[depends] += "linux-master:do_fetch"
+KREF = "git.kernel.org.preempt-rt.linux-5.12.y"
+do_fetch[depends] += "linux-rt-5.12:do_fetch"
+
+GITFETCHREFS_machine += " refs/heads/standard/*:refs/heads/standard/*"
+GITCLONEARGS_machine = "--bare --single-branch --branch master"
+
+SRC_URI = 
"git://git.yoctoproject.org/linux-yocto-dev.git;name=machine;branch=${KBRANCH};altref=${KREF}
 \
            
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=master;destsuffix=${KMETA}"
 
 # Set default SRCREVs. Both the machine and meta SRCREVs are statically set
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9655): 
https://lists.yoctoproject.org/g/linux-yocto/message/9655
Mute This Topic: https://lists.yoctoproject.org/mt/81808196/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to