* Drop recipe for 6.8 kernel
* Add recipe for 6.10 kernel
* Move the patches specific to kernel 6.10 to the recipe
Signed-off-by: Yogesh Tyagi <yogesh.ty...@intel.com>
---
..._registry-fix-reproducibility-issues.patch | 48 +++++++++++++++
...-conmakehash-improve-reproducibility.patch | 58 +++++++++++++++++++
...linux-intel_6.8.bb => linux-intel_6.10.bb} | 13 +++--
3 files changed, 114 insertions(+), 5 deletions(-)
create mode 100644
recipes-kernel/linux/linux-intel/0001-6.10-lib-build_OID_registry-fix-reproducibility-issues.patch
create mode 100644
recipes-kernel/linux/linux-intel/0001-6.10-vt-conmakehash-improve-reproducibility.patch
rename recipes-kernel/linux/{linux-intel_6.8.bb => linux-intel_6.10.bb} (55%)
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.10-lib-build_OID_registry-fix-reproducibility-issues.patch
new file mode 100644
index 00000000..df2a4139
--- /dev/null
+++
b/recipes-kernel/linux/linux-intel/0001-6.10-lib-build_OID_registry-fix-reproducibility-issues.patch
@@ -0,0 +1,48 @@
+From 4881d0f985aab70c685bd63b56a2d6ad5e790abc Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfi...@gmail.com>
+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 <bruce.ashfi...@gmail.com>
+Upstream-Status: Inappropriate
+
+Taken from linux-yocto, v5.15/standard/base.
+
+Signed-off-by: Anuj Mittal <anuj.mit...@intel.com>
+---
+ 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 8267e8d71338..755dd33a8b04 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 = ();
+@@ -40,7 +41,7 @@ open C_FILE, ">$ARGV[1]" or die;
+ print C_FILE "/*\n";
+ my $scriptname = $0;
+ $scriptname =~ s#^\Q$abs_srctree/\E##;
+-print C_FILE " * Automatically generated by ", $scriptname, ". 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.10-vt-conmakehash-improve-reproducibility.patch
b/recipes-kernel/linux/linux-intel/0001-6.10-vt-conmakehash-improve-reproducibility.patch
new file mode 100644
index 00000000..fd89af6c
--- /dev/null
+++
b/recipes-kernel/linux/linux-intel/0001-6.10-vt-conmakehash-improve-reproducibility.patch
@@ -0,0 +1,58 @@
+From 5635e0677692bc502588b09d04f138394e02669b Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfi...@gmail.com>
+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 <bruce.ashfi...@gmail.com>
+
+Upstream-Status: Inappropriate
+
+Taken from linux-yocto, v5.15/standard/base
+Signed-off-by: Anuj Mittal <anuj.mit...@intel.com>
+---
+ 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 2c8ce8b592ed..8532077ed3bb 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 dc2177fec715..9df2198c459b 100644
+--- a/drivers/tty/vt/conmakehash.c
++++ b/drivers/tty/vt/conmakehash.c
+@@ -264,7 +264,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);
+
+ 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.10.bb
similarity index 55%
rename from recipes-kernel/linux/linux-intel_6.8.bb
rename to recipes-kernel/linux/linux-intel_6.10.bb
index 30343357..69ee742a 100644
--- a/recipes-kernel/linux/linux-intel_6.8.bb
+++ b/recipes-kernel/linux/linux-intel_6.10.bb
@@ -2,7 +2,10 @@ require linux-intel.inc
SRC_URI:prepend =
"git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1;
\
"
-KMETA_BRANCH = "master"
+SRC_URI:append =
"file://0001-6.10-vt-conmakehash-improve-reproducibility.patch \
+
file://0001-6.10-lib-build_OID_registry-fix-reproducibility-issues.patch \
+ "
+KMETA_BRANCH = "yocto-6.10"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
@@ -10,13 +13,13 @@ DEPENDS += "elfutils-native openssl-native
util-linux-native"
LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}"
-LINUX_VERSION ?= "6.8"
-SRCREV_machine ?= "4b78f19d1c451c3738b10d489e67977e97036a7f"
-SRCREV_meta ?= "d6379f226f25136d9292f09cd7c11921f0bbcd9b"
+LINUX_VERSION ?= "6.10"
+SRCREV_machine ?= "37b6bf1243b894e0da6e640e589d479f3208f5ae"
+SRCREV_meta ?= "e4d2ade39f231ea279f19298c008ba48f4a202e5"
# 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.7-rc3-linux-(?P<pver>(\d+)T(\d+)Z)$"
+UPSTREAM_CHECK_GITTAGREGEX =
"^mainline-tracking-v6.10-linux-(?P<pver>(\d+)T(\d+)Z)$"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8394):
https://lists.yoctoproject.org/g/meta-intel/message/8394
Mute This Topic: https://lists.yoctoproject.org/mt/108136678/21656
Group Owner: meta-intel+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
