diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index f78f5205..bf42cf8d 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -7,8 +7,6 @@ KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;n SRC_URI = " \ ${KERNEL_CONFIG_URI} \ - file://0001-vt-conmakehash-improve-reproducibility.patch \ - file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ file://fix-perf-reproducibility.patch \ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ file://0002-mconf-fix-output-of-cflags-and-libraries.patch \ diff --git a/recipes-kernel/linux/linux-intel/0001-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-6.6-lib-build_OID_registry-fix-reproducibility-issues.patch similarity index 79% rename from recipes-kernel/linux/linux-intel/0001-lib-build_OID_registry-fix-reproducibility-issues.patch rename to recipes-kernel/linux/linux-intel/0001-6.6-lib-build_OID_registry-fix-reproducibility-issues.patch index d41c3f0b..6a734c9c 100644 --- a/recipes-kernel/linux/linux-intel/0001-lib-build_OID_registry-fix-reproducibility-issues.patch +++ b/recipes-kernel/linux/linux-intel/0001-6.6-lib-build_OID_registry-fix-reproducibility-issues.patch @@ -1,4 +1,4 @@ -From 2fca0fd719812ea2ff67630b01355aa80481623e Mon Sep 17 00:00:00 2001 +From 879157a156dd90c8d4c678179d93a2d28766364c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 10 Jul 2022 22:56:53 -0400 Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues @@ -23,26 +23,26 @@ Signed-off-by: Anuj Mittal 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/build_OID_registry b/lib/build_OID_registry -index d7fc32ea8ac2..f6de0a7f7457 100755 +index 56d8bafeb848..1518e3790674 100755 --- a/lib/build_OID_registry +++ b/lib/build_OID_registry -@@ -8,6 +8,7 @@ - # +@@ -9,6 +9,7 @@ use strict; + use Cwd qw(abs_path); +use File::Basename; my @names = (); my @oids = (); -@@ -35,7 +36,7 @@ close IN_FILE || die; +@@ -38,7 +39,7 @@ close IN_FILE || die; # open C_FILE, ">$ARGV[1]" or die; print C_FILE "/*\n"; --print C_FILE " * Automatically generated by ", $0, ". Do not edit\n"; +-print C_FILE " * Automatically generated by ", $0 =~ s#^\Q$abs_srctree/\E##r, ". Do not edit\n"; +print C_FILE " * Automatically generated by ", basename $0, ". Do not edit\n"; print C_FILE " */\n"; # -- -2.36.1 +2.34.1 diff --git a/recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch b/recipes-kernel/linux/linux-intel/0001-6.6-vt-conmakehash-improve-reproducibility.patch similarity index 94% rename from recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch rename to recipes-kernel/linux/linux-intel/0001-6.6-vt-conmakehash-improve-reproducibility.patch index 33280063..0ecacb30 100644 --- a/recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch +++ b/recipes-kernel/linux/linux-intel/0001-6.6-vt-conmakehash-improve-reproducibility.patch @@ -1,4 +1,4 @@ -From 0f586f4ee8adacac79b64d1f3d47799a5eb7fbea Mon Sep 17 00:00:00 2001 +From 2f662283528bc003d0be988bf6590a271ebe7755 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 10 Jul 2022 21:37:07 -0400 Subject: [PATCH] vt/conmakehash: improve reproducibility @@ -28,7 +28,7 @@ Signed-off-by: Anuj Mittal 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile -index fe30ce512819..cb51c21b58f9 100644 +index b3dfe9d5717e..6ee3736776c8 100644 --- a/drivers/tty/vt/Makefile +++ b/drivers/tty/vt/Makefile @@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c @@ -54,5 +54,5 @@ index cddd789fe46e..d62510b280e9 100644 for ( i = 0 ; i < fontlen ; i++ ) { -- -2.36.1 +2.34.1 diff --git a/recipes-kernel/linux/linux-intel_6.6.bb b/recipes-kernel/linux/linux-intel_6.6.bb index 5c262f5e..f3982d69 100644 --- a/recipes-kernel/linux/linux-intel_6.6.bb +++ b/recipes-kernel/linux/linux-intel_6.6.bb @@ -2,6 +2,9 @@ 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" @@ -11,9 +14,9 @@ DEPENDS += "elfutils-native openssl-native util-linux-native" LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" -LINUX_VERSION ?= "6.6.30" -SRCREV_machine ?= "86a43fc66c95e24b7cc9e3adf2f4874b589bf9d5" -SRCREV_meta ?= "66bebb6789d02e775d4c93d7ca4bf79c2ead4b28" +LINUX_VERSION ?= "6.6.44" +SRCREV_machine ?= "b013322897f67589f5806ea4c7db0665f7b99d9f" +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \