* Drop recipe for 6.10 kernel * Drop the patch 0001-6.10-vt-conmakehash-improve-reproducibility.patch * Add recipe for 6.11 kernel
Signed-off-by: Yogesh Tyagi <[email protected]> --- ...OID_registry-fix-reproducibility-issues.patch} | 0 ...-vt-conmakehash-improve-reproducibility.patch} | 15 +++++++-------- .../{linux-intel_6.10.bb => linux-intel_6.11.bb} | 13 ++++++------- 3 files changed, 13 insertions(+), 15 deletions(-) rename recipes-kernel/linux/linux-intel/{0001-6.10-lib-build_OID_registry-fix-reproducibility-issues.patch => 0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch} (100%) rename recipes-kernel/linux/linux-intel/{0001-6.10-vt-conmakehash-improve-reproducibility.patch => 0001-6.11-vt-conmakehash-improve-reproducibility.patch} (85%) rename recipes-kernel/linux/{linux-intel_6.10.bb => linux-intel_6.11.bb} (62%) diff --git a/recipes-kernel/linux/linux-intel/0001-6.10-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch similarity index 100% rename from recipes-kernel/linux/linux-intel/0001-6.10-lib-build_OID_registry-fix-reproducibility-issues.patch rename to recipes-kernel/linux/linux-intel/0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch diff --git a/recipes-kernel/linux/linux-intel/0001-6.10-vt-conmakehash-improve-reproducibility.patch b/recipes-kernel/linux/linux-intel/0001-6.11-vt-conmakehash-improve-reproducibility.patch similarity index 85% rename from recipes-kernel/linux/linux-intel/0001-6.10-vt-conmakehash-improve-reproducibility.patch rename to recipes-kernel/linux/linux-intel/0001-6.11-vt-conmakehash-improve-reproducibility.patch index fd89af6c..3fd10238 100644 --- a/recipes-kernel/linux/linux-intel/0001-6.10-vt-conmakehash-improve-reproducibility.patch +++ b/recipes-kernel/linux/linux-intel/0001-6.11-vt-conmakehash-improve-reproducibility.patch @@ -1,4 +1,4 @@ -From 5635e0677692bc502588b09d04f138394e02669b Mon Sep 17 00:00:00 2001 +From 280d5a341dc49f96372bbf9d7d7c9b286d8e0223 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <[email protected]> Date: Sun, 10 Jul 2022 21:37:07 -0400 Subject: [PATCH] vt/conmakehash: improve reproducibility @@ -24,8 +24,8 @@ Taken from linux-yocto, v5.15/standard/base Signed-off-by: Anuj Mittal <[email protected]> --- drivers/tty/vt/Makefile | 2 +- - drivers/tty/vt/conmakehash.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + drivers/tty/vt/conmakehash.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile index 2c8ce8b592ed..8532077ed3bb 100644 @@ -41,18 +41,17 @@ index 2c8ce8b592ed..8532077ed3bb 100644 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash $(call cmd,conmk) diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c -index dc2177fec715..9df2198c459b 100644 +index a931fcde7ad9..fc23117108df 100644 --- a/drivers/tty/vt/conmakehash.c +++ b/drivers/tty/vt/conmakehash.c -@@ -264,7 +264,7 @@ int main(int argc, char *argv[]) +@@ -250,6 +250,7 @@ int main(int argc, char *argv[]) #include <linux/types.h>\n\ \n\ u8 dfont_unicount[%d] = \n\ --{\n\t", rel_tblname, fontlen); +{\n\t", argv[2], fontlen); + {\n\t", fontlen); for ( i = 0 ; i < fontlen ; i++ ) - { -- -2.34.1 +2.43.0 diff --git a/recipes-kernel/linux/linux-intel_6.10.bb b/recipes-kernel/linux/linux-intel_6.11.bb similarity index 62% rename from recipes-kernel/linux/linux-intel_6.10.bb rename to recipes-kernel/linux/linux-intel_6.11.bb index c6e5cf1c..2e9c9d99 100644 --- a/recipes-kernel/linux/linux-intel_6.10.bb +++ b/recipes-kernel/linux/linux-intel_6.11.bb @@ -2,10 +2,9 @@ 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.10-vt-conmakehash-improve-reproducibility.patch \ - file://0001-6.10-lib-build_OID_registry-fix-reproducibility-issues.patch \ +SRC_URI:append = " file://0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch \ " -KMETA_BRANCH = "yocto-6.10" +KMETA_BRANCH = "master" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" @@ -13,13 +12,13 @@ DEPENDS += "elfutils-native openssl-native util-linux-native" LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" -LINUX_VERSION ?= "6.10" -SRCREV_machine ?= "37b6bf1243b894e0da6e640e589d479f3208f5ae" -SRCREV_meta ?= "e4d2ade39f231ea279f19298c008ba48f4a202e5" +LINUX_VERSION ?= "6.11" +SRCREV_machine ?= "9a961f4b0a6a2655ef37e86b8588f2946b427650" +SRCREV_meta ?= "5b42ba3f7fd0bb7b15d194871152f3b1a30f3926" # 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.10-linux-(?P<pver>(\d+)T(\d+)Z)$" +UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.11-linux-(?P<pver>(\d+)T(\d+)Z)$" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8424): https://lists.yoctoproject.org/g/meta-intel/message/8424 Mute This Topic: https://lists.yoctoproject.org/mt/108820634/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
