summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Eatmon <reatmon@ti.com>2024-09-16 11:08:59 -0500
committerRyan Eatmon <reatmon@ti.com>2024-10-01 06:58:22 -0500
commit079107e09ead1a624fcc90f4f30b3aa122cb357a (patch)
tree6d0d3560b98958c2d4d51cb42e9384528a4528ec
parent348fa454bcfb6334fe91939b1735c7ee41cf2512 (diff)
downloadmeta-ti-079107e09ead1a624fcc90f4f30b3aa122cb357a.tar.gz
linux: Remove two 6.6 reproducibility patches
The upcoming SRCREV change to the linux-ti 6.6 kernel version no longer needs these two patches, and they are blocking the CICD promotion being in place. Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-lib-build_OID_registry-fix-reproducibility-issues.patch46
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-pnmtologo-use-relocatable-file-name.patch55
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc2
3 files changed, 0 insertions, 103 deletions
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-lib-build_OID_registry-fix-reproducibility-issues.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-lib-build_OID_registry-fix-reproducibility-issues.patch
deleted file mode 100644
index 75477ef8..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/files/0001-lib-build_OID_registry-fix-reproducibility-issues.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 2fca0fd719812ea2ff67630b01355aa80481623e Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Sun, 10 Jul 2022 22:56:53 -0400
4Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues
5
6The script build_OID_registry captures the full path of itself
7in the generated data. This causes reproduciblity issues as the
8path is captured and packaged.
9
10We use the basename of the script instead, and that allows us
11to be reprodicible, with slightly less information captured in
12the output data (but the generating script can still easily
13be found).
14
15Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
16
17Upstream-Status: Inappropriate
18
19Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
20---
21 lib/build_OID_registry | 3 ++-
22 1 file changed, 2 insertions(+), 1 deletion(-)
23
24diff --git a/lib/build_OID_registry b/lib/build_OID_registry
25index d7fc32ea8ac2..f6de0a7f7457 100755
26--- a/lib/build_OID_registry
27+++ b/lib/build_OID_registry
28@@ -8,6 +8,7 @@
29 #
30
31 use strict;
32+use File::Basename;
33
34 my @names = ();
35 my @oids = ();
36@@ -35,7 +36,7 @@ close IN_FILE || die;
37 #
38 open C_FILE, ">$ARGV[1]" or die;
39 print C_FILE "/*\n";
40-print C_FILE " * Automatically generated by ", $0, ". Do not edit\n";
41+print C_FILE " * Automatically generated by ", basename $0, ". Do not edit\n";
42 print C_FILE " */\n";
43
44 #
45--
462.25.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-pnmtologo-use-relocatable-file-name.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-pnmtologo-use-relocatable-file-name.patch
deleted file mode 100644
index bfc081fa..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/files/0001-pnmtologo-use-relocatable-file-name.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From a40d2daf2795d89e3ef8af0413b25190558831ec Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Thu, 14 Jul 2022 14:43:46 -0400
4Subject: [PATCH] pnmtologo: use relocatable file name
5
6The logo generation utility is capturing the source of the logo
7in the generated .c file. The source file is absolute (as passed
8by make), so the full path is captured.
9
10This makes the source fail reproducibility tests.
11
12We use basename() to just get the source file name, and use
13that in the generated .c file.
14
15Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
16
17Upstream-Status: Inappropriate
18
19Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
20---
21 drivers/video/logo/pnmtologo.c | 5 +++--
22 1 file changed, 3 insertions(+), 2 deletions(-)
23
24diff --git a/drivers/video/logo/pnmtologo.c b/drivers/video/logo/pnmtologo.c
25index ada5ef6e51b7..7527be845443 100644
26--- a/drivers/video/logo/pnmtologo.c
27+++ b/drivers/video/logo/pnmtologo.c
28@@ -13,7 +13,7 @@
29 #include <stdlib.h>
30 #include <string.h>
31 #include <unistd.h>
32-
33+#include <libgen.h>
34
35 static const char *programname;
36 static const char *filename;
37@@ -223,6 +223,7 @@ static inline int is_equal(struct color c1, struct color c2)
38
39 static void write_header(void)
40 {
41+ char *filename_basename = basename(filename);
42 /* open logo file */
43 if (outputname) {
44 out = fopen(outputname, "w");
45@@ -235,7 +236,7 @@ static void write_header(void)
46 fputs("/*\n", out);
47 fputs(" * DO NOT EDIT THIS FILE!\n", out);
48 fputs(" *\n", out);
49- fprintf(out, " * It was automatically generated from %s\n", filename);
50+ fprintf(out, " * It was automatically generated from %s\n", filename_basename);
51 fputs(" *\n", out);
52 fprintf(out, " * Linux logo %s\n", logoname);
53 fputs(" */\n\n", out);
54--
552.25.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
index 4cd5886a..4bcbc27e 100644
--- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
@@ -21,9 +21,7 @@ KERNEL_PATCHES:bsp-mainline = " \
21" 21"
22 22
23KERNEL_PATCHES:bsp-ti-6_6 = " \ 23KERNEL_PATCHES:bsp-ti-6_6 = " \
24 file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
25 file://0001-vt-conmakehash-improve-reproducibility.patch \ 24 file://0001-vt-conmakehash-improve-reproducibility.patch \
26 file://0001-pnmtologo-use-relocatable-file-name.patch \
27" 25"
28 26
29SRC_URI:append = " ${KERNEL_PATCHES} " 27SRC_URI:append = " ${KERNEL_PATCHES} "