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 deleted file mode 100644 index 2933c40e3..000000000 --- a/recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 5ef6dc08cfde240b8c748733759185646e654570 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= -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 -Cc: Masahiro Yamada -Reviewed-by: Nicolas Schier -Signed-off-by: Andrew Morton ---- - 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-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 deleted file mode 100644 index b9ec1be3a..000000000 --- a/recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fb3b9c2d217f1f51fffe19fc0f4eaf55e2d4ea4f Mon Sep 17 00:00:00 2001 -From: Lucas Stach -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 -Signed-off-by: Helge Deller ---- - 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 \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 320e8a0f3..e039dd9c8 100644 --- a/recipes-kernel/linux/linux-imx_6.6.bb +++ b/recipes-kernel/linux/linux-imx_6.6.bb @@ -18,8 +18,6 @@ SRCREV = "e0f9e2afd4cff3f02d71891244b4aa5899dfc786" 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