With all the heavy lifting done, all that is needed is to select the
right endpoint for our reference, and the right fetch wildcards to
ensure we only get what we need. We've got:
linux-5.10 (superset contining v5.4)
--> stable-5.4
--> linux-5.4-rt
--> linux-yocto_5.4 (and rt/tiny variants)
and hence the preempt-rt is the endpoint for the reference.
Signed-off-by: Paul Gortmaker <paul.gortma...@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 7 ++++++-
meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 7 ++++++-
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 7 ++++++-
3 files changed, 18 insertions(+), 3 deletions(-)
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 2ffc8ed5428b..373da8501f6b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -14,7 +14,11 @@ python () {
SRCREV_machine ?= "65bbe689d98a007848008be2c8edeb5fa8066829"
SRCREV_meta ?= "19738ca97b999a3b150e2d34232bb44b6537348f"
-SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
+KREF = "git.kernel.org.preempt-rt.linux-5.4.y"
+GITFETCHREFS_machine += " refs/heads/v5.4/*:refs/heads/v5.4/*"
+GITCLONEARGS_machine = "--bare --single-branch --branch v5.4/base"
+
+SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH};altref=${KREF}
\
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LINUX_VERSION ?= "5.4.107"
@@ -23,6 +27,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
+do_fetch[depends] += "linux-rt-5.4:do_fetch"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 2b6e35a69c10..40327039368f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
+do_fetch[depends] += "linux-rt-5.4:do_fetch"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
@@ -21,7 +22,11 @@ SRCREV_meta ?= "19738ca97b999a3b150e2d34232bb44b6537348f"
PV = "${LINUX_VERSION}+git${SRCPV}"
-SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
+KREF = "git.kernel.org.preempt-rt.linux-5.4.y"
+GITFETCHREFS_machine += " refs/heads/v5.4/*:refs/heads/v5.4/*"
+GITCLONEARGS_machine = "--bare --single-branch --branch v5.4/base"
+
+SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH};altref=${KREF}
\
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 245c3d574b44..938f3bc9e595 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -26,7 +26,11 @@ SRCREV_meta ?= "19738ca97b999a3b150e2d34232bb44b6537348f"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
-SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
+KREF = "git.kernel.org.preempt-rt.linux-5.4.y"
+GITFETCHREFS_machine += " refs/heads/v5.4/*:refs/heads/v5.4/*"
+GITCLONEARGS_machine = "--bare --single-branch --branch v5.4/base"
+
+SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH};altref=${KREF};
\
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
@@ -34,6 +38,7 @@ LINUX_VERSION ?= "5.4.107"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
+do_fetch[depends] += "linux-rt-5.4:do_fetch"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9653):
https://lists.yoctoproject.org/g/linux-yocto/message/9653
Mute This Topic: https://lists.yoctoproject.org/mt/81808190/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
