5 files changed, 183 insertions, 7 deletions

diff --git a/recipes-kernel/linux/linux-imx-headers_6.6.bb b/recipes-kernel/linux/linux-imx-headers_6.6.bb
index 95ec32b0..65634ac9 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.6.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.6.bb
@@ -1,4 +1,4 @@
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 SUMMARY = "Installs i.MX-specific kernel headers"
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf-6.6.y"
-LOCALVERSION = "-6.6.3-1.0.0"
-SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a"
+LOCALVERSION = "-6.6.23-2.0.0"
+SRCREV = "b586a521770e508d1d440ccb085c7696b9d6d387"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch b/recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch
new file mode 100644
index 00000000..2933c40e
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch
@@ -0,0 +1,62 @@
+From 5ef6dc08cfde240b8c748733759185646e654570 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
+Date: Wed, 13 Mar 2024 22:19:56 +0100
+Subject: [PATCH] lib/build_OID_registry: don't mention the full path of the
+ script in output
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This change strips the full path of the script generating
+lib/oid_registry_data.c to just lib/build_OID_registry.  The motivation
+for this change is Yocto emitting a build warning
+
+        File /usr/src/debug/linux-lxatac/6.7-r0/lib/oid_registry_data.c in package linux-lxatac-src contains reference to TMPDIR [buildpaths]
+
+So this change brings us one step closer to make the build result
+reproducible independent of the build path.
+
+Upstream-Status: Backport [https://github.com/torvalds/linux/commit/5ef6dc08cfde240b8c748733759185646e654570]
+
+Link: https://lkml.kernel.org/r/20240313211957.884561-2-u.kleine-koenig@pengutronix.de
+Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Cc: Masahiro Yamada <masahiroy@kernel.org>
+Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+---
+ lib/build_OID_registry | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/build_OID_registry b/lib/build_OID_registry
+index d7fc32ea8ac2..56d8bafeb848 100755
+--- a/lib/build_OID_registry
++++ b/lib/build_OID_registry
+@@ -8,6 +8,7 @@
+ #
+ 
+ use strict;
++use Cwd qw(abs_path);
+ 
+ my @names = ();
+ my @oids = ();
+@@ -17,6 +18,8 @@ if ($#ARGV != 1) {
+     exit(2);
+ }
+ 
++my $abs_srctree = abs_path($ENV{'srctree'});
++
+ #
+ # Open the file to read from
+ #
+@@ -35,7 +38,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 " */\n";
+ 
+ #
+-- 
+2.34.1
+
diff --git a/recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch b/recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch
new file mode 100644
index 00000000..dbeae515
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch
@@ -0,0 +1,70 @@
+From 3bd85c6c97b2d232638594bf828de62083fe3389 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
+Date: Mon, 11 Mar 2024 12:30:18 +0100
+Subject: [PATCH] tty: vt: conmakehash: Don't mention the full path of the
+ input in output
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This change strips $abs_srctree of the input file containing the
+character mapping table in the generated output. The motivation for this
+change is Yocto emitting a build warning
+
+        WARNING: linux-lxatac-6.7-r0 do_package_qa: QA Issue: File /usr/src/debug/linux-lxatac/6.7-r0/drivers/tty/vt/consolemap_deftbl.c in package linux-lxatac-src contains reference to TMPDIR
+
+So this change brings us one step closer to make the build result
+reproducible independent of the build path.
+
+Upstream-Status: Backport [https://github.com/torvalds/linux/commit/3bd85c6c97b2d232638594bf828de62083fe3389]
+
+Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Link: https://lore.kernel.org/r/20240311113017.483101-2-u.kleine-koenig@pengutronix.de
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/vt/conmakehash.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
+index cddd789fe46e..dc2177fec715 100644
+--- a/drivers/tty/vt/conmakehash.c
++++ b/drivers/tty/vt/conmakehash.c
+@@ -76,7 +76,8 @@ static void addpair(int fp, int un)
+ int main(int argc, char *argv[])
+ {
+   FILE *ctbl;
+-  char *tblname;
++  const char *tblname, *rel_tblname;
++  const char *abs_srctree;
+   char buffer[65536];
+   int fontlen;
+   int i, nuni, nent;
+@@ -101,6 +102,16 @@ int main(int argc, char *argv[])
+        }
+     }
+ 
++  abs_srctree = getenv("abs_srctree");
++  if (abs_srctree && !strncmp(abs_srctree, tblname, strlen(abs_srctree)))
++    {
++      rel_tblname = tblname + strlen(abs_srctree);
++      while (*rel_tblname == '/')
++       ++rel_tblname;
++    }
++  else
++    rel_tblname = tblname;
++
+   /* For now we assume the default font is always 256 characters. */
+   fontlen = 256;
+ 
+@@ -253,7 +264,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", rel_tblname, fontlen);
+ 
+   for ( i = 0 ; i < fontlen ; i++ )
+     {
+-- 
+2.34.1
+
diff --git a/recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch b/recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch
new file mode 100644
index 00000000..b9ec1be3
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch
@@ -0,0 +1,38 @@
+From fb3b9c2d217f1f51fffe19fc0f4eaf55e2d4ea4f Mon Sep 17 00:00:00 2001
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Wed, 10 Apr 2024 15:41:21 +0200
+Subject: [PATCH 6/6] video: logo: Drop full path of the input filename in
+ generated file
+
+Avoid this Yocto build warning to make build reproducible:
+
+    WARNING: linux-foo-6.8-r0 do_package_qa: QA Issue:
+    File /usr/src/debug/linux-foo/6.8-r0/drivers/video/logo/logo_linux_clut224.c
+    in package linux-foo-src contains reference to TMPDIR
+
+Helge modified the patch to drop the whole line.
+
+Upstream-Status: Backport [https://github.com/torvalds/linux/commit/fb3b9c2d217f1f51fffe19fc0f4eaf55e2d4ea4f]
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Signed-off-by: Helge Deller <deller@gmx.de>
+---
+ drivers/video/logo/pnmtologo.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/video/logo/pnmtologo.c b/drivers/video/logo/pnmtologo.c
+index 2434a25afb64..8080c4d9c4a2 100644
+--- a/drivers/video/logo/pnmtologo.c
++++ b/drivers/video/logo/pnmtologo.c
+@@ -235,8 +235,6 @@ static void write_header(void)
+        fputs("/*\n", out);
+        fputs(" *  DO NOT EDIT THIS FILE!\n", out);
+        fputs(" *\n", out);
+-       fprintf(out, " *  It was automatically generated from %s\n", filename);
+-       fputs(" *\n", out);
+        fprintf(out, " *  Linux logo %s\n", logoname);
+        fputs(" */\n\n", out);
+        fputs("#include <linux/linux_logo.h>\n\n", out);
+-- 
+2.34.1
+
diff --git a/recipes-kernel/linux/linux-imx_6.6.bb b/recipes-kernel/linux/linux-imx_6.6.bb
index 409e1f66..b90b40d3 100644
--- a/recipes-kernel/linux/linux-imx_6.6.bb
+++ b/recipes-kernel/linux/linux-imx_6.6.bb
@@ -1,5 +1,5 @@
 # Copyright 2013-2016 (C) Freescale Semiconductor
-# Copyright 2017-2023 (C) NXP
+# Copyright 2017-2024 (C) NXP
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 #
@@ -13,15 +13,21 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU
 require recipes-kernel/linux/linux-imx.inc
 
 SRCBRANCH = "lf-6.6.y"
-LOCALVERSION = "-6.6.3-1.0.0"
-SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a"
+LOCALVERSION = "-6.6.23-2.0.0"
+SRCREV = "b586a521770e508d1d440ccb085c7696b9d6d387"
+
+SRC_URI += " \
+    file://0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch \
+    file://0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch \
+    file://0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch \
+"
 
 # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
 # required by kernel-yocto.bbclass.
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "6.6.3"
+LINUX_VERSION = "6.6.23"
 
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"