diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-27 23:42:03 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-18 21:20:24 +0000 |
commit | 7143980b5f0e1ddf81c3b6ff03096a9d249012ac (patch) | |
tree | 57a0b1d506e05233540ebbd37e961585cbe890fe /meta/recipes-devtools/syslinux/syslinux/determinism.patch | |
parent | 00833c52d6459758f1da8e9f88710fa14bd1bc5e (diff) | |
download | poky-7143980b5f0e1ddf81c3b6ff03096a9d249012ac.tar.gz |
syslinux: Fix reproducibility issues
Add sorting to wildcard expansion in the makefile to make builds
reproducible.
(From OE-Core rev: 7529d0a5fff17e35238c0f005163360f7f903898)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5541ba76ccc0c416f315bc0dc14a20a33059bd5f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/syslinux/syslinux/determinism.patch')
-rw-r--r-- | meta/recipes-devtools/syslinux/syslinux/determinism.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-devtools/syslinux/syslinux/determinism.patch b/meta/recipes-devtools/syslinux/syslinux/determinism.patch new file mode 100644 index 0000000000..2fb8c64df3 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/determinism.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | In order to build deterministic binaries, we need to sort the wildcard expansion | ||
2 | so the libraries are linked in the same order each time. This fixes reproducibility | ||
3 | issues within syslinux builds. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | RP 2021/3/1 | ||
7 | |||
8 | Index: syslinux-6.04-pre2/mk/lib.mk | ||
9 | =================================================================== | ||
10 | --- syslinux-6.04-pre2.orig/mk/lib.mk | ||
11 | +++ syslinux-6.04-pre2/mk/lib.mk | ||
12 | @@ -130,8 +130,8 @@ LIBENTRY_OBJS = \ | ||
13 | exit.o | ||
14 | |||
15 | LIBGCC_OBJS = \ | ||
16 | - $(patsubst $(com32)/lib/%.c,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.c)) \ | ||
17 | - $(patsubst $(com32)/lib/%.S,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.S)) | ||
18 | + $(sort $(patsubst $(com32)/lib/%.c,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.c))) \ | ||
19 | + $(sort $(patsubst $(com32)/lib/%.S,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.S))) | ||
20 | |||
21 | LIBCONSOLE_OBJS = \ | ||
22 | \ | ||