diff --git a/recipes-kernel/linux/linux-intel_6.12.bb b/recipes-kernel/linux/linux-intel_6.12.bb index d3933898..3bda3236 100644 --- a/recipes-kernel/linux/linux-intel_6.12.bb +++ b/recipes-kernel/linux/linux-intel_6.12.bb @@ -1,24 +1,25 @@ require linux-intel.inc -SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ - " -SRC_URI:append = " file://0001-6.11-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch \ +SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ + " +SRC_URI:append = " file://0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch \ " +KBRANCH = "6.12/linux" KMETA_BRANCH = "yocto-6.12" 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 ?= "6.12" -SRCREV_machine ?= "0f23779724ce8d6654abd0ef2a4167dd37d677c8" -SRCREV_meta ?= "b6eb84a3327f850c42300c394586fe58a57db72d" +LINUX_VERSION ?= "6.12.16" +SRCREV_machine ?= "934bc38849dd7c6cabd8110d3ef2bd50a7fc79c4" +SRCREV_meta ?= "f24c58a63b7e047d2c4441dd2adc30de21c8814d" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \ features/security/security.scc \ features/intel-npu/intel-npu.scc" -UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.12-linux-(?P(\d+)T(\d+)Z)$" +UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?Pv6.12.(\d+)-linux-(\d+)T(\d+)Z)$" diff --git a/recipes-kernel/linux/linux-intel_6.6.bb b/recipes-kernel/linux/linux-intel_6.6.bb deleted file mode 100644 index a7949232..00000000 --- a/recipes-kernel/linux/linux-intel_6.6.bb +++ /dev/null @@ -1,26 +0,0 @@ -require linux-intel.inc - -SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ - " -SRC_URI:append = " file://0001-6.6-vt-conmakehash-improve-reproducibility.patch \ - file://0001-6.6-lib-build_OID_registry-fix-reproducibility-issues.patch \ - " -KBRANCH = "6.6/linux" -KMETA_BRANCH = "yocto-6.6" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -DEPENDS += "elfutils-native openssl-native util-linux-native" - -LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" - -LINUX_VERSION ?= "6.6.63" -SRCREV_machine ?= "248856fd22b40784d5b53ac2c600064502573b9d" -SRCREV_meta ?= "693358ea6816821663168ac9063d60e52a8ee4fe" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \ - features/security/security.scc \ - features/intel-npu/intel-npu.scc" - -UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?Pv6.6.(\d+)-linux-(\d+)T(\d+)Z)$"