|
 |
949addd |
From a919d214d10870a54c6a5e383a19a6e82e5f8a54 Mon Sep 17 00:00:00 2001
|
|
|
949addd |
From: Christian Seiler <christian@iwakd.de>
|
|
|
949addd |
Date: Sat, 13 Feb 2016 00:56:19 +0100
|
|
|
949addd |
Subject: [PATCH] Build system: sort object file lists
|
|
|
949addd |
|
|
|
949addd |
The object file list generated by the wildcard Makefile function is not
|
|
|
949addd |
deterministic, because it may change depending on the underlying file
|
|
|
949addd |
system.
|
|
|
949addd |
|
|
|
949addd |
Use the sort function to make the list deterministic in these cases, to
|
|
|
949addd |
be able to build open-iscsi deterministically. See
|
|
|
949addd |
<https://reproducible-builds.org/>
|
|
|
949addd |
for further details.
|
|
|
949addd |
|
|
|
949addd |
Signed-off-by: Christian Seiler <christian@iwakd.de>
|
|
|
949addd |
---
|
|
|
949addd |
usr/Makefile | 4 ++--
|
|
|
949addd |
utils/fwparam_ibft/Makefile | 2 +-
|
|
|
949addd |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
949addd |
|
|
|
949addd |
diff --git a/usr/Makefile b/usr/Makefile
|
|
|
949addd |
index 5ac0726..277ac6a 100644
|
|
|
949addd |
--- a/usr/Makefile
|
|
|
949addd |
+++ b/usr/Makefile
|
|
|
949addd |
@@ -34,7 +34,7 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D$(OSNAME) $(IPC_CFLAGS)
|
|
|
949addd |
PROGRAMS = iscsid iscsiadm iscsistart
|
|
|
949addd |
|
|
|
949addd |
# libc compat files
|
|
|
949addd |
-SYSDEPS_SRCS = $(wildcard ../utils/sysdeps/*.o)
|
|
|
949addd |
+SYSDEPS_SRCS = $(sort $(wildcard ../utils/sysdeps/*.o))
|
|
|
949addd |
# sources shared between iscsid, iscsiadm and iscsistart
|
|
|
949addd |
ISCSI_LIB_SRCS = iscsi_util.o io.o auth.o iscsi_timer.o login.o log.o md5.o \
|
|
|
949addd |
sha1.o iface.o idbm.o sysfs.o host.o session_info.o iscsi_sysfs.o \
|
|
|
949addd |
@@ -45,7 +45,7 @@ ISCSI_LIB_SRCS = iscsi_util.o io.o auth.o iscsi_timer.o login.o log.o md5.o \
|
|
|
949addd |
INITIATOR_SRCS = initiator.o scsi.o actor.o event_poll.o mgmt_ipc.o kern_err_table.o
|
|
|
949addd |
|
|
|
949addd |
# fw boot files
|
|
|
949addd |
-FW_BOOT_SRCS = $(wildcard ../utils/fwparam_ibft/*.o)
|
|
|
949addd |
+FW_BOOT_SRCS = $(sort $(wildcard ../utils/fwparam_ibft/*.o))
|
|
|
949addd |
|
|
|
949addd |
# core discovery files
|
|
|
949addd |
DISCOVERY_SRCS = $(FW_BOOT_SRCS) strings.o discovery.o
|
|
|
949addd |
diff --git a/utils/fwparam_ibft/Makefile b/utils/fwparam_ibft/Makefile
|
|
|
949addd |
index 773d8eb..ade8a56 100644
|
|
|
949addd |
--- a/utils/fwparam_ibft/Makefile
|
|
|
949addd |
+++ b/utils/fwparam_ibft/Makefile
|
|
|
949addd |
@@ -21,7 +21,7 @@
|
|
|
949addd |
# "Prasanna Mumbai" <mumbai.prasanna@gmail.com>
|
|
|
949addd |
#
|
|
|
949addd |
|
|
|
949addd |
-SYSDEPS_OBJS = $(wildcard ../sysdeps/*.o)
|
|
|
949addd |
+SYSDEPS_OBJS = $(sort $(wildcard ../sysdeps/*.o))
|
|
|
949addd |
OBJS := fw_entry.o fwparam_sysfs.o $(SYSDEPS_OBJS) ../../usr/iscsi_net_util.o
|
|
|
949addd |
OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o
|
|
|
949addd |
CLEANFILES = $(OBJS) *.output *~
|
|
|
949addd |
--
|
|
|
949addd |
2.1.4
|
|
|
949addd |
|