* Refresh patches Signed-off-by: Yogesh Tyagi <[email protected]> --- ..._registry-fix-reproducibility-issues.patch | 48 +++++++++++++++ ...-conmakehash-improve-reproducibility.patch | 58 +++++++++++++++++++ recipes-kernel/linux/linux-intel_6.8.bb | 4 ++ 3 files changed, 110 insertions(+) create mode 100644 recipes-kernel/linux/linux-intel/0001-6.8-lib-build_OID_registry-fix-reproducibility-issues.patch create mode 100644 recipes-kernel/linux/linux-intel/0001-6.8-vt-conmakehash-improve-reproducibility.patch
diff --git a/recipes-kernel/linux/linux-intel/0001-6.8-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-6.8-lib-build_OID_registry-fix-reproducibility-issues.patch new file mode 100644 index 00000000..313e5dae --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0001-6.8-lib-build_OID_registry-fix-reproducibility-issues.patch @@ -0,0 +1,48 @@ +From 5e919368eaabcfbd91e8d61922849dc37622cea0 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <[email protected]> +Date: Sun, 10 Jul 2022 22:56:53 -0400 +Subject: [PATCH 2/2] 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 d7fc32ea8ac2..f6de0a7f7457 100755 +--- a/lib/build_OID_registry ++++ b/lib/build_OID_registry +@@ -8,6 +8,7 @@ + # + + use strict; ++use File::Basename; + + my @names = (); + my @oids = (); +@@ -35,7 +36,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 ", basename $0, ". Do not edit\n"; + print C_FILE " */\n"; + + # +-- +2.34.1 + diff --git a/recipes-kernel/linux/linux-intel/0001-6.8-vt-conmakehash-improve-reproducibility.patch b/recipes-kernel/linux/linux-intel/0001-6.8-vt-conmakehash-improve-reproducibility.patch new file mode 100644 index 00000000..1fac9432 --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0001-6.8-vt-conmakehash-improve-reproducibility.patch @@ -0,0 +1,58 @@ +From 5173c844a7814d0bc6f54cc75bb33e033b08e88c Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <[email protected]> +Date: Sun, 10 Jul 2022 21:37:07 -0400 +Subject: [PATCH 1/2] 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.8.bb b/recipes-kernel/linux/linux-intel_6.8.bb index 30343357..dccda073 100644 --- a/recipes-kernel/linux/linux-intel_6.8.bb +++ b/recipes-kernel/linux/linux-intel_6.8.bb @@ -2,6 +2,10 @@ 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.8-vt-conmakehash-improve-reproducibility.patch \ + file://0001-6.8-lib-build_OID_registry-fix-reproducibility-issues.patch \ + " + KMETA_BRANCH = "master" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8411): https://lists.yoctoproject.org/g/meta-intel/message/8411 Mute This Topic: https://lists.yoctoproject.org/mt/108428650/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
