Move the patches specific to kernel 6.6 to 6.6 recipe
Signed-off-by: Yogesh Tyagi <[email protected]>
---
recipes-kernel/linux/linux-intel.inc | 2 -
..._registry-fix-reproducibility-issues.patch | 48 +++++++++++++++
...-conmakehash-improve-reproducibility.patch | 58 +++++++++++++++++++
recipes-kernel/linux/linux-intel_6.6.bb | 9 ++-
4 files changed, 112 insertions(+), 5 deletions(-)
create mode 100644
recipes-kernel/linux/linux-intel/0002-lib-build_OID_registry-fix-reproducibility-issues.patch
create mode 100644
recipes-kernel/linux/linux-intel/0002-vt-conmakehash-improve-reproducibility.patch
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/0002-lib-build_OID_registry-fix-reproducibility-issues.patch
b/recipes-kernel/linux/linux-intel/0002-lib-build_OID_registry-fix-reproducibility-issues.patch
new file mode 100644
index 00000000..6a734c9c
--- /dev/null
+++
b/recipes-kernel/linux/linux-intel/0002-lib-build_OID_registry-fix-reproducibility-issues.patch
@@ -0,0 +1,48 @@
+From 879157a156dd90c8d4c678179d93a2d28766364c Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Sun, 10 Jul 2022 22:56:53 -0400
+Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues
+
+The script build_OID_registry captures the full path of itself
+in the generated data. This causes reproduciblity issues as the
+path is captured and packaged.
+
+We use the basename of the script instead, and that allows us
+to be reprodicible, with slightly less information captured in
+the output data (but the generating script can still easily
+be found).
+
+Signed-off-by: Bruce Ashfield <[email protected]>
+Upstream-Status: Inappropriate
+
+Taken from linux-yocto, v5.15/standard/base.
+
+Signed-off-by: Anuj Mittal <[email protected]>
+---
+ lib/build_OID_registry | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/build_OID_registry b/lib/build_OID_registry
+index 56d8bafeb848..1518e3790674 100755
+--- a/lib/build_OID_registry
++++ b/lib/build_OID_registry
+@@ -9,6 +9,7 @@
+
+ use strict;
+ use Cwd qw(abs_path);
++use File::Basename;
+
+ my @names = ();
+ my @oids = ();
+@@ -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 =~ 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.34.1
+
diff --git
a/recipes-kernel/linux/linux-intel/0002-vt-conmakehash-improve-reproducibility.patch
b/recipes-kernel/linux/linux-intel/0002-vt-conmakehash-improve-reproducibility.patch
new file mode 100644
index 00000000..0ecacb30
--- /dev/null
+++
b/recipes-kernel/linux/linux-intel/0002-vt-conmakehash-improve-reproducibility.patch
@@ -0,0 +1,58 @@
+From 2f662283528bc003d0be988bf6590a271ebe7755 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
+
+The file generated by conmakehash capture the application
+path used to generate the file. While that can be informative,
+it varies based on where the kernel was built, as the full
+path is captured.
+
+We tweak the application to use a second input as the "capture
+name", and then modify the Makefile to pass the basename of
+the source, making it reproducible.
+
+This could be improved by using some sort of path mapping,
+or the application manipualing argv[1] itself, but for now
+this solves the reprodicibility issue.
+
+Signed-off-by: Bruce Ashfield <[email protected]>
+
+Upstream-Status: Inappropriate
+
+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(-)
+
+diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
+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
+ hostprogs += conmakehash
+
+ quiet_cmd_conmk = CONMK $@
+- cmd_conmk = $(obj)/conmakehash $< > $@
++ cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@
+
+ $(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 cddd789fe46e..d62510b280e9 100644
+--- a/drivers/tty/vt/conmakehash.c
++++ b/drivers/tty/vt/conmakehash.c
+@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
+ #include <linux/types.h>\n\
+ \n\
+ u8 dfont_unicount[%d] = \n\
+-{\n\t", argv[1], fontlen);
++{\n\t", argv[2], fontlen);
+
+ for ( i = 0 ; i < fontlen ; i++ )
+ {
+--
+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..0168547e 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://0002-vt-conmakehash-improve-reproducibility.patch \
+
file://0002-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 \
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8389):
https://lists.yoctoproject.org/g/meta-intel/message/8389
Mute This Topic: https://lists.yoctoproject.org/mt/108052797/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
