From 6a9e47a63846e743e8e5f7d58d7ac2809b6513b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 14 Aug 2025 12:07:03 +0200 Subject: [PATCH] linux-intel/6.12: Drop useless patch Since commit v6.10-rc1~98^2~59 = 5ef6dc08cfde ("lib/build_OID_registry: don't mention the full path of the script in output") the purpose of patch 0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch is already given in plain mainline. The patch only subsitutes one way to make the build result reproducible by another one. So drop the patch. Signed-off-by: Anuj Mittal --- recipes-kernel/linux/linux-intel-rt_6.12.bb | 2 - ..._registry-fix-reproducibility-issues.patch | 48 ------------------- recipes-kernel/linux/linux-intel_6.12.bb | 2 - 3 files changed, 52 deletions(-) delete mode 100644 recipes-kernel/linux/linux-intel/0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch diff --git a/recipes-kernel/linux/linux-intel-rt_6.12.bb b/recipes-kernel/linux/linux-intel-rt_6.12.bb index 13b495d1..47dc5cbd 100644 --- a/recipes-kernel/linux/linux-intel-rt_6.12.bb +++ b/recipes-kernel/linux/linux-intel-rt_6.12.bb @@ -2,8 +2,6 @@ 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://0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch \ - " # Skip processing of this recipe if it is not explicitly specified as the # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying diff --git a/recipes-kernel/linux/linux-intel/0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch deleted file mode 100644 index df2a4139..00000000 --- a/recipes-kernel/linux/linux-intel/0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4881d0f985aab70c685bd63b56a2d6ad5e790abc Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -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 -Upstream-Status: Inappropriate - -Taken from linux-yocto, v5.15/standard/base. - -Signed-off-by: Anuj Mittal ---- - 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_6.12.bb b/recipes-kernel/linux/linux-intel_6.12.bb index 32b0b2e4..1ebd7fae 100644 --- a/recipes-kernel/linux/linux-intel_6.12.bb +++ b/recipes-kernel/linux/linux-intel_6.12.bb @@ -2,8 +2,6 @@ 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://0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch \ - " KBRANCH = "6.12/linux" KMETA_BRANCH = "yocto-6.12"