From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 14/14] systemd-boot: restore reproducibility
Date: Sun, 9 Jan 2022 23:27:32 +0100 [thread overview]
Message-ID: <20220109222732.2252416-14-alex@linutronix.de> (raw)
In-Reply-To: <20220109222732.2252416-1-alex@linutronix.de>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-core/systemd/systemd.inc | 3 +-
...list-fundamental_source_paths-using-.patch | 28 +++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-core/systemd/systemd/0001-src-fundamental-list-fundamental_source_paths-using-.patch
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index e416f8d64b..6739018559 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -17,6 +17,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
SRCREV = "402280118fe082122437638f53a0019c4aea81aa"
SRCBRANCH = "v250-stable"
SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
-"
+ file://0001-src-fundamental-list-fundamental_source_paths-using-.patch \
+ "
S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/systemd/systemd/0001-src-fundamental-list-fundamental_source_paths-using-.patch b/meta/recipes-core/systemd/systemd/0001-src-fundamental-list-fundamental_source_paths-using-.patch
new file mode 100644
index 0000000000..1d0887490c
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-src-fundamental-list-fundamental_source_paths-using-.patch
@@ -0,0 +1,28 @@
+From 8e882df78ede98c15a3f2567fabebfde1d774b02 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 7 Jan 2022 21:20:15 +0100
+Subject: [PATCH] src/fundamental: list fundamental_source_paths using relative
+ paths
+
+Otherwise, the compiler takes the full path to the source file
+and writes it into the binary output, breaking reproducibility.
+
+Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/22047]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ src/fundamental/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fundamental/meson.build b/src/fundamental/meson.build
+index 287f0fe36a..954bdf150b 100644
+--- a/src/fundamental/meson.build
++++ b/src/fundamental/meson.build
+@@ -20,7 +20,7 @@ sources = '''
+ # for sd-boot
+ fundamental_source_paths = []
+ foreach source : sources
+- fundamental_source_paths += meson.current_source_dir() / source
++ fundamental_source_paths += '../../fundamental/' + source
+ endforeach
+
+ # for libbasic
--
2.20.1
next prev parent reply other threads:[~2022-01-09 22:28 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-09 22:27 [PATCH 01/14] python3: drop unneeded multiprocessing module patch Alexander Kanavin
2022-01-09 22:27 ` [PATCH 02/14] ruby: disable rdoc due to non-reproducibility Alexander Kanavin
2022-01-09 22:27 ` [PATCH 03/14] rust-llvm: apply the same reproducibility patch as for llvm proper Alexander Kanavin
2022-01-09 22:27 ` [PATCH 04/14] busybox: update 1.34.1 -> 1.35.0 Alexander Kanavin
2022-01-10 15:09 ` [OE-core] " akuster808
[not found] ` <16C8F145D420B770.27414@lists.openembedded.org>
2022-01-10 15:10 ` Armin Kuster
2022-01-09 22:27 ` [PATCH 05/14] systemd: update 249.7 -> 250.1 Alexander Kanavin
2022-01-09 22:27 ` [PATCH 06/14] python3-numpy: update 1.21.4 -> 1.22.0 Alexander Kanavin
2022-01-09 22:27 ` [PATCH 07/14] mdadm: update 4.1 -> 4.2 Alexander Kanavin
2022-01-09 22:27 ` [PATCH 08/14] librsvg: update 2.52.4 -> 2.52.5 Alexander Kanavin
2022-01-09 22:27 ` [PATCH 09/14] libportal: update 0.4 -> 0.5 Alexander Kanavin
2022-01-09 22:27 ` [PATCH 10/14] epiphany: make libportal optional, and move it to meta-oe Alexander Kanavin
2022-01-10 18:43 ` [OE-core] " Khem Raj
2022-01-10 18:49 ` Alexander Kanavin
2022-01-10 18:57 ` Khem Raj
2022-01-10 19:18 ` Alexander Kanavin
2022-01-10 20:54 ` Khem Raj
2022-01-11 7:49 ` Khem Raj
2022-01-11 8:48 ` Alexander Kanavin
2022-01-11 19:44 ` Khem Raj
2022-01-09 22:27 ` [PATCH 11/14] qemuboot/runqemu: fully form the ip= kernel parameter Alexander Kanavin
2022-01-09 22:27 ` [PATCH 12/14] parselogs: add a couple systemd false positives Alexander Kanavin
2022-01-09 22:27 ` [PATCH 13/14] connman: do nothing in qemu, do not touch eth0 Alexander Kanavin
2022-01-11 10:54 ` [OE-core] " Richard Purdie
2022-01-11 11:02 ` Alexander Kanavin
2022-01-11 11:08 ` Richard Purdie
2022-01-11 11:10 ` Alexander Kanavin
2022-01-11 11:15 ` Richard Purdie
2022-01-09 22:27 ` Alexander Kanavin [this message]
2022-01-10 13:59 ` [OE-core] [PATCH 01/14] python3: drop unneeded multiprocessing module patch Richard Purdie
2022-01-10 14:21 ` Alexander Kanavin
2022-01-10 14:23 ` Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220109222732.2252416-14-alex@linutronix.de \
--to=alex.kanavin@gmail.com \
--cc=alex@linutronix.de \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox