summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-10-09 22:08:07 -0700
committerKhem Raj <raj.khem@gmail.com>2024-11-19 13:13:27 -0800
commitb66ff5fec301fd5bca890a73f81c4c11e31a7f5f (patch)
tree82773703b460405249d3d120bfe2424df6617c55
parenta07f028b7ab561cf805b5080022e99ec862703ac (diff)
downloadmeta-openembedded-b66ff5fec301fd5bca890a73f81c4c11e31a7f5f.tar.gz
ndisc6: Fix reproducible build
includes the CFLAGS used to build the package in the binary via PACKAGE_CONFIGURE_INVOCATION which then includes the absolute build path via (eg.) the -ffile-prefix-map flag. Here we remove using variables like PACKAGE_CONFIGURE_INVOCATION in code Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 70c663b7ae90283d25ca3704852ca96aa808e31a) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch85
-rw-r--r--meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb1
2 files changed, 86 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch
new file mode 100644
index 0000000000..7bfb17bf08
--- /dev/null
+++ b/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch
@@ -0,0 +1,85 @@
1From 7b3e78cf0348ea737609a2ace07c7c55aae36bcb Mon Sep 17 00:00:00 2001
2From: Santiago Vila <sanvila@debian.org>
3Date: Wed, 9 Oct 2024 22:05:09 -0700
4Subject: [PATCH] Remove use of variables indicating buildtime information
5
6We should not really care about the build date or the build host
7
8Sourced From: https://salsa.debian.org/debian/ndisc6/-/blob/master/debian/patches/reproducible-build.patch?ref_type=heads
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 rdnss/rdnssd.c | 2 --
14 src/addrinfo.c | 2 --
15 src/ndisc.c | 2 --
16 src/tcpspray.c | 2 --
17 src/traceroute.c | 2 --
18 5 files changed, 10 deletions(-)
19
20diff --git a/rdnss/rdnssd.c b/rdnss/rdnssd.c
21index b87edb2..7201525 100644
22--- a/rdnss/rdnssd.c
23+++ b/rdnss/rdnssd.c
24@@ -741,8 +741,6 @@ version (void)
25 {
26 printf (_("rdnssd: IPv6 Recursive DNS Server discovery Daemon %s (%s)\n"),
27 VERSION, "$Rev$");
28- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
29- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
30 puts (_("Written by Pierre Ynard and Remi Denis-Courmont\n"));
31
32 printf (_("Copyright (C) %u-%u Pierre Ynard, Remi Denis-Courmont\n"),
33diff --git a/src/addrinfo.c b/src/addrinfo.c
34index cd73722..6316abd 100644
35--- a/src/addrinfo.c
36+++ b/src/addrinfo.c
37@@ -148,8 +148,6 @@ static int quick_usage (const char *path)
38 static int version (void)
39 {
40 printf (_("addrinfo %s (%s)\n"), VERSION, "$Rev$");
41- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
42- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
43 puts (_("Written by Remi Denis-Courmont\n"));
44
45 printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2002, 2007);
46diff --git a/src/ndisc.c b/src/ndisc.c
47index b190b18..6e222a0 100644
48--- a/src/ndisc.c
49+++ b/src/ndisc.c
50@@ -920,9 +920,7 @@ version (void)
51 {
52 printf (_(
53 "ndisc6: IPv6 Neighbor/Router Discovery userland tool %s (%s)\n"), VERSION, "$Rev$");
54- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
55
56- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
57 puts (_("Written by Remi Denis-Courmont\n"));
58
59 printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2004, 2007);
60diff --git a/src/tcpspray.c b/src/tcpspray.c
61index 39d8939..6347795 100644
62--- a/src/tcpspray.c
63+++ b/src/tcpspray.c
64@@ -302,8 +302,6 @@ version (void)
65 {
66 printf (_(
67 "tcpspray6: TCP/IP bandwidth tester %s (%s)\n"), VERSION, "$Rev$");
68- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
69- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
70 puts (_("Written by Remi Denis-Courmont\n"));
71
72 printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007);
73diff --git a/src/traceroute.c b/src/traceroute.c
74index 489bc55..604b6af 100644
75--- a/src/traceroute.c
76+++ b/src/traceroute.c
77@@ -1251,8 +1251,6 @@ version (void)
78 {
79 printf (_(
80 "traceroute6: TCP & UDP IPv6 traceroute tool %s (%s)\n"), VERSION, "$Rev$");
81- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
82- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
83 puts (_("Written by Remi Denis-Courmont\n"));
84
85 printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007);
diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
index fb00b83516..21579d64c1 100644
--- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
+++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
8SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5" 8SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5"
9SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ 9SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \
10 file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ 10 file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \
11 file://0001-Remove-use-of-variables-indicating-buildtime-informa.patch \
11 " 12 "
12 13
13S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"