*Replace v5.19 with linux-intel-lts v6.1.26-rt8 kernel. *Make linux-intel-lts v6.1.26 the default RT kernel for poky and poky-altcfg.
Signed-off-by: Teoh Suh Haw <[email protected]> --- conf/machine/include/meta-intel.inc | 4 ++-- ...intel-rt_5.19.bb => linux-intel-rt_6.1.bb} | 22 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) rename recipes-kernel/linux/{linux-intel-rt_5.19.bb => linux-intel-rt_6.1.bb} (55%) diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index b5115fd7..cb10f88d 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc @@ -8,9 +8,9 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel" PREFERRED_VERSION_linux-intel ?= "6.1%" -PREFERRED_VERSION_linux-intel-rt ?= "5.19%" +PREFERRED_VERSION_linux-intel-rt ?= "6.1%" PREFERRED_VERSION_linux-intel:poky-altcfg ?= "6.2%" -PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "5.19%" +PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "6.1%" # Need to point to latest version of libva needed for media components PREFERRED_PROVIDER_libva = "libva-intel" diff --git a/recipes-kernel/linux/linux-intel-rt_5.19.bb b/recipes-kernel/linux/linux-intel-rt_6.1.bb similarity index 55% rename from recipes-kernel/linux/linux-intel-rt_5.19.bb rename to recipes-kernel/linux/linux-intel-rt_6.1.bb index 4ff9e0fe..2a93062d 100644 --- a/recipes-kernel/linux/linux-intel-rt_5.19.bb +++ b/recipes-kernel/linux/linux-intel-rt_6.1.bb @@ -1,7 +1,8 @@ require linux-intel.inc -SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ +SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ " + # Skip processing of this recipe if it is not explicitly specified as the # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying # to build multiple virtual/kernel providers, e.g. as dependency of @@ -11,17 +12,22 @@ python () { raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") } -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +KBRANCH = "6.1/preempt-rt" +KMETA_BRANCH = "yocto-6.1" -KMETA_BRANCH = "yocto-5.19" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" +LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" -LINUX_VERSION ?= "5.19.0" -SRCREV_machine ?= "3abe09b48ca3c13b50c78d3b7b0d7ce668211a70" -SRCREV_meta ?= "f5d4c109d6de04005def04c3a06f053ae0c397ad" +LINUX_VERSION ?= "6.1.26" +SRCREV_machine ?= "de05aba07179c0782af8abfbc8abd05bd3f00735" +SRCREV_meta ?= "6c9bc579ad765338fad63685f7d4dd5773fa2416" LINUX_KERNEL_TYPE = "preempt-rt" -UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v5.19-(?P<pver>rt(\d+)-preempt-rt-(\d+)T(\d+)Z)$" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" + +UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.1.(\d+)-rt(\d)-preempt-rt-(\d+)T(\d+)Z)$" -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7974): https://lists.yoctoproject.org/g/meta-intel/message/7974 Mute This Topic: https://lists.yoctoproject.org/mt/99125503/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
