|
 |
d5c737 |
From 709afd3e2c946a765550992fa93adca8a88f2952 Mon Sep 17 00:00:00 2001
|
|
|
d5c737 |
From: Pierre Bourdon <delroth@gmail.com>
|
|
|
d5c737 |
Date: Tue, 13 Aug 2019 05:08:20 +0200
|
|
|
d5c737 |
Subject: [PATCH 41/63] Makefile: sort $(wildcard) output for reproducibility
|
|
|
d5c737 |
|
|
|
d5c737 |
https://reproducible-builds.org/docs/stable-inputs/
|
|
|
d5c737 |
|
|
|
d5c737 |
This should fix reproducibility issues noticed on Debian[1] and NixOS[2]
|
|
|
d5c737 |
|
|
|
d5c737 |
[1] https://tests.reproducible-builds.org/debian/rb-pkg/buster/i386/diffoscope-results/efivar.html
|
|
|
d5c737 |
[2] https://r13y.com/diff/b32a9d1c4159dab6aa15e873c0e5fc315ea2bdf545416d21d5b4a29f3c138727-3473019ee52f59732b13253b828bf2eb545384510f30db34413eb6c91dd3d047.html
|
|
|
d5c737 |
---
|
|
|
d5c737 |
src/Makefile | 6 +++---
|
|
|
d5c737 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
d5c737 |
|
|
|
d5c737 |
diff --git a/src/Makefile b/src/Makefile
|
|
|
d5c737 |
index 3729d2b8f35..253d1f1d56c 100644
|
|
|
d5c737 |
--- a/src/Makefile
|
|
|
d5c737 |
+++ b/src/Makefile
|
|
|
d5c737 |
@@ -15,7 +15,7 @@ TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PCTARGETS)
|
|
|
d5c737 |
STATICTARGETS=$(STATICLIBTARGETS) $(STATICBINTARGETS)
|
|
|
d5c737 |
|
|
|
d5c737 |
LIBEFIBOOT_SOURCES = crc32.c creator.c disk.c gpt.c loadopt.c path-helpers.c \
|
|
|
d5c737 |
- linux.c $(wildcard linux-*.c)
|
|
|
d5c737 |
+ linux.c $(sort $(wildcard linux-*.c))
|
|
|
d5c737 |
LIBEFIBOOT_OBJECTS = $(patsubst %.c,%.o,$(LIBEFIBOOT_SOURCES))
|
|
|
d5c737 |
LIBEFIVAR_SOURCES = crc32.c dp.c dp-acpi.c dp-hw.c dp-media.c dp-message.c \
|
|
|
d5c737 |
efivarfs.c error.c export.c guid.c guids.S guid-symbols.c \
|
|
|
d5c737 |
@@ -25,7 +25,7 @@ EFIVAR_SOURCES = efivar.c
|
|
|
d5c737 |
GENERATED_SOURCES = include/efivar/efivar-guids.h guid-symbols.c
|
|
|
d5c737 |
MAKEGUIDS_SOURCES = makeguids.c guid.c
|
|
|
d5c737 |
ALL_SOURCES=$(LIBEFIBOOT_SOURCES) $(LIBEFIVAR_SOURCES) $(MAKEGUIDS_SOURCES) \
|
|
|
d5c737 |
- $(wildcard include/efivar/*.h) $(GENERATED_SOURCES) $(EFIVAR_SOURCES)
|
|
|
d5c737 |
+ $(sort $(wildcard include/efivar/*.h)) $(GENERATED_SOURCES) $(EFIVAR_SOURCES)
|
|
|
d5c737 |
|
|
|
d5c737 |
$(call deps-of,$(ALL_SOURCES)) : | deps
|
|
|
d5c737 |
-include $(call deps-of,$(ALL_SOURCES))
|
|
|
d5c737 |
@@ -103,7 +103,7 @@ install : all
|
|
|
d5c737 |
$(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR)
|
|
|
d5c737 |
$(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;)
|
|
|
d5c737 |
$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/efivar
|
|
|
d5c737 |
- $(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(INCLUDEDIR)/efivar/$(notdir $(x));)
|
|
|
d5c737 |
+ $(foreach x, $(sort $(wildcard $(TOPDIR)/src/include/efivar/*.h)), $(INSTALL) -m 644 $(x) $(DESTDIR)$(INCLUDEDIR)/efivar/$(notdir $(x));)
|
|
|
d5c737 |
$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
|
|
|
d5c737 |
$(foreach x, $(BINTARGETS), $(INSTALL) -m 755 $(x) $(DESTDIR)$(BINDIR);)
|
|
|
d5c737 |
|
|
|
d5c737 |
--
|
|
|
d5c737 |
2.26.2
|
|
|
d5c737 |
|