diff options
| author | Uwe Kleine-König <u.kleine-koenig@baylibre.com> | 2025-08-14 12:07:03 +0200 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@intel.com> | 2025-08-15 16:30:44 +0800 |
| commit | 6a9e47a63846e743e8e5f7d58d7ac2809b6513b5 (patch) | |
| tree | 38fe3ffc6f466cc4186f1a8f8ec3bf362e2ffa17 | |
| parent | 13628c25b6b1db94c2ce6d33bebec68bcf57bb16 (diff) | |
| download | meta-intel-6a9e47a63846e743e8e5f7d58d7ac2809b6513b5.tar.gz | |
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 <anuj.mittal@intel.com>
3 files changed, 0 insertions, 52 deletions
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 | |||
| 2 | 2 | ||
| 3 | SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | 3 | SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ |
| 4 | " | 4 | " |
| 5 | SRC_URI:append = " file://0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch \ | ||
| 6 | " | ||
| 7 | 5 | ||
| 8 | # Skip processing of this recipe if it is not explicitly specified as the | 6 | # Skip processing of this recipe if it is not explicitly specified as the |
| 9 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | 7 | # 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 @@ | |||
| 1 | From 4881d0f985aab70c685bd63b56a2d6ad5e790abc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
| 3 | Date: Sun, 10 Jul 2022 22:56:53 -0400 | ||
| 4 | Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues | ||
| 5 | |||
| 6 | The script build_OID_registry captures the full path of itself | ||
| 7 | in the generated data. This causes reproduciblity issues as the | ||
| 8 | path is captured and packaged. | ||
| 9 | |||
| 10 | We use the basename of the script instead, and that allows us | ||
| 11 | to be reprodicible, with slightly less information captured in | ||
| 12 | the output data (but the generating script can still easily | ||
| 13 | be found). | ||
| 14 | |||
| 15 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
| 16 | Upstream-Status: Inappropriate | ||
| 17 | |||
| 18 | Taken from linux-yocto, v5.15/standard/base. | ||
| 19 | |||
| 20 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 21 | --- | ||
| 22 | lib/build_OID_registry | 3 ++- | ||
| 23 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 24 | |||
| 25 | diff --git a/lib/build_OID_registry b/lib/build_OID_registry | ||
| 26 | index 8267e8d71338..755dd33a8b04 100755 | ||
| 27 | --- a/lib/build_OID_registry | ||
| 28 | +++ b/lib/build_OID_registry | ||
| 29 | @@ -9,6 +9,7 @@ | ||
| 30 | |||
| 31 | use strict; | ||
| 32 | use Cwd qw(abs_path); | ||
| 33 | +use File::Basename; | ||
| 34 | |||
| 35 | my @names = (); | ||
| 36 | my @oids = (); | ||
| 37 | @@ -40,7 +41,7 @@ open C_FILE, ">$ARGV[1]" or die; | ||
| 38 | print C_FILE "/*\n"; | ||
| 39 | my $scriptname = $0; | ||
| 40 | $scriptname =~ s#^\Q$abs_srctree/\E##; | ||
| 41 | -print C_FILE " * Automatically generated by ", $scriptname, ". Do not edit\n"; | ||
| 42 | +print C_FILE " * Automatically generated by ", basename $0, ". Do not edit\n"; | ||
| 43 | print C_FILE " */\n"; | ||
| 44 | |||
| 45 | # | ||
| 46 | -- | ||
| 47 | 2.34.1 | ||
| 48 | |||
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 | |||
| 2 | 2 | ||
| 3 | SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | 3 | SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ |
| 4 | " | 4 | " |
| 5 | SRC_URI:append = " file://0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch \ | ||
| 6 | " | ||
| 7 | KBRANCH = "6.12/linux" | 5 | KBRANCH = "6.12/linux" |
| 8 | KMETA_BRANCH = "yocto-6.12" | 6 | KMETA_BRANCH = "yocto-6.12" |
| 9 | 7 | ||
