File xen.cb8366d34ef5021af761ca1977d9cb305ba8fabd.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File xen.cb8366d34ef5021af761ca1977d9cb305ba8fabd.patch of Package xen (Revision 3b077056294bcb49994ea3227248b4ad)

Currently displaying revision 3b077056294bcb49994ea3227248b4ad , Show latest

From: Olaf Hering <olaf@aepfle.de>
Date: Tue, 3 Feb 2015 12:45:36 +0100
Subject: cb8366d34ef5021af761ca1977d9cb305ba8fabd

etherboot: [build] sort objects in blib.a

When building hvmloader for Xen tools the ipxe objects are also linked
into the binary. Unfortunately the linker will place them in the order
found in the archive. Since this order is random the resulting hvmloader
binary differs when it was built from identical sources but on different
build hosts. To help with creating a reproducible binary the elements in
blib.a must simply be sorted before passing them to $(AR).

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
 tools/firmware/etherboot/patches/build-compare.patch | 19 +++++++++++++++++++
 tools/firmware/etherboot/patches/series              |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 tools/firmware/etherboot/patches/build-compare.patch

new file mode 100644
--- /dev/null
+++ b/tools/firmware/etherboot/patches/build-compare.patch
@@ -0,0 +1,19 @@
+The result of $(wildcard *) is random.
+Sort input files to reduce build-compare noise.
+---
+ ipxe/src/Makefile.housekeeping |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ipxe/src/Makefile.housekeeping
+===================================================================
+--- ipxe/src/Makefile.housekeeping
++++ ipxe/src/Makefile.housekeeping
+@@ -773,7 +773,7 @@ BLIB		= $(BIN)/blib.a
+ $(BLIB) : $(BLIB_OBJS) $(BLIB_LIST) $(MAKEDEPS)
+ 	$(Q)$(RM) $(BLIB)
+ 	$(QM)$(ECHO) "  [AR] $@"
+-	$(Q)$(AR) r $@ $(BLIB_OBJS)
++	$(Q)$(AR) r $@ $(sort $(BLIB_OBJS))
+ 	$(Q)$(RANLIB) $@
+ blib : $(BLIB)
+ 
--- a/tools/firmware/etherboot/patches/series
+++ b/tools/firmware/etherboot/patches/series
@@ -1,4 +1,5 @@
 boot_prompt_option.patch
 build_fix_1.patch
 build_fix_2.patch
 build_fix_3.patch
+build-compare.patch

Places

File xen.cb8366d34ef5021af761ca1977d9cb305ba8fabd.patch of Package xen (Revision 3b077056294bcb49994ea3227248b4ad)

Places