summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-13 11:58:40 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-13 11:58:40 +0000
commit6e8e8bbbd5480891247f4e8bfcebe19b5144ae8d (patch)
tree5d6434f8432370e4f8335de01dc91db27b63f753
parentReleasing progress-linux version 3:6.04~git20171011.af7e95c3+dfsg1-1~dschinn1. (diff)
downloadsyslinux-6e8e8bbbd5480891247f4e8bfcebe19b5144ae8d.zip
syslinux-6e8e8bbbd5480891247f4e8bfcebe19b5144ae8d.tar.xz
Merging debian version 3:6.04~git20171011.af7e95c3+dfsg1-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/0009-reproducible-build.patch33
2 files changed, 39 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 1ade69b..b60833e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+syslinux (3:6.04~git20171011.af7e95c3+dfsg1-2) experimental; urgency=medium
+
+ * Extend 0009-reproducible-build.patch: Also sort file lists obtained using
+ `find`, so they are passed to `ar` in a deterministic order.
+
+ -- Lukas Schwaighofer <lukas@schwaighofer.name> Sat, 04 Nov 2017 11:52:54 +0100
+
syslinux (3:6.04~git20171011.af7e95c3+dfsg1-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/0009-reproducible-build.patch b/debian/patches/0009-reproducible-build.patch
index ae7a472..5331649 100644
--- a/debian/patches/0009-reproducible-build.patch
+++ b/debian/patches/0009-reproducible-build.patch
@@ -1,7 +1,38 @@
Author: Reiner Herrmann <reiner@reiner-h.de>
+Author: Lukas Schwaighofer <lukas@schwaighofer.name>
Description: Sort object files for reproducible linking order
-Forwarded: http://www.syslinux.org/archives/2017-October/025940.html
+--- a/core/Makefile
++++ b/core/Makefile
+@@ -41,9 +41,9 @@
+ # All primary source files for the main syslinux files
+ NASMSRC := $(sort $(wildcard $(SRC)/*.asm))
+ NASMHDR := $(sort $(wildcard $(SRC)/*.inc))
+-CSRC := $(shell find $(SRC) -name '*.c' -print)
+-SSRC := $(shell find $(SRC) -name '*.S' -print)
+-CHDR := $(shell find $(SRC) -name '*.h' -print)
++CSRC := $(sort $(shell find $(SRC) -name '*.c' -print))
++SSRC := $(sort $(shell find $(SRC) -name '*.S' -print))
++CHDR := $(sort $(shell find $(SRC) -name '*.h' -print))
+ OTHERSRC := keywords
+ ALLSRC = $(NASMSRC) $(NASMHDR) $(CSRC) $(SSRC) $(CHDR) $(OTHERSRC)
+
+@@ -56,13 +56,13 @@
+ $(addprefix $(SRC)/fs/pxe/, dhcp_option.c pxe.c tftp.c urlparse.c bios.c)
+
+ LPXELINUX_CSRC = $(CORE_PXE_CSRC) \
+- $(shell find $(SRC)/lwip -name '*.c' -print) \
++ $(sort $(shell find $(SRC)/lwip -name '*.c' -print)) \
+ $(addprefix $(SRC)/fs/pxe/, \
+ core.c dnsresolv.c ftp.c ftp_readdir.c gpxeurl.c http.c \
+ http_readdir.c idle.c isr.c tcp.c)
+
+ PXELINUX_CSRC = $(CORE_PXE_CSRC) \
+- $(shell find $(SRC)/legacynet -name '*.c' -print)
++ $(sort $(shell find $(SRC)/legacynet -name '*.c' -print))
+
+ LPXELINUX_OBJS = $(subst $(SRC)/,,$(LPXELINUX_CSRC:%.c=%.o))
+ PXELINUX_OBJS = $(subst $(SRC)/,,$(PXELINUX_CSRC:%.c=%.o))
--- a/efi/Makefile
+++ b/efi/Makefile
@@ -17,15 +17,15 @@