File 2001-ipxe-stable-buildid.patch of Package qemu-testsuite.28156
From: Bruce Rogers <brogers@suse.com> Date: Fri, 25 Jan 2019 09:37:44 -0700 Subject: ipxe: stable buildid It is desirable to produce the same bits on subsequent builds when the actual code of the package doesn't change. (bsc#1011213) Signed-off-by: Bruce Rogers <brogers@suse.com> --- src/Makefile.housekeeping | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/roms/ipxe/src/Makefile.housekeeping b/roms/ipxe/src/Makefile.housekeeping index f09db37289e3d29382dc46deda1d..748d9e4404d74d9f00765a5d29d9 100644 --- a/roms/ipxe/src/Makefile.housekeeping +++ b/roms/ipxe/src/Makefile.housekeeping @@ -1141,11 +1141,18 @@ blib : $(BLIB) # Command to generate build ID. Must be unique for each $(BIN)/%.tmp, # even within the same build run. # -BUILD_ID_CMD := perl -e 'printf "0x%08x", int ( rand ( 0xffffffff ) );' +# NB: In the case of the SUSE qemu-ipxe package we want reproducible +# builds, so we just use the TGT_ROM_NAME variable, which is already +# a unique (in the context of the files we generate) hex value suitable +# for specifying the build_id. We no longer define a BUILD_ID_CMD, as +# we need to use the TGT_ROM_NAME variable directly in the link command # Build timestamp # -BUILD_TIMESTAMP := $(shell date +%s) +# NB: In the case of the SUSE qemu-ipxe package we want reproducible +# builds, so we use a pre-determined timestamp, rather than the current +# timestamp +BUILD_TIMESTAMP := $(PACKAGING_TIMESTAMP) # Build version # @@ -1165,7 +1172,7 @@ $(BIN)/version.%.o : core/version.c $(MAKEDEPS) $(GIT_INDEX) $(BIN)/%.tmp : $(BIN)/version.%.o $(BLIB) $(MAKEDEPS) $(LDSCRIPT) $(QM)$(ECHO) " [LD] $@" $(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $< $(BLIB) -o $@ \ - --defsym _build_id=`$(BUILD_ID_CMD)` \ + --defsym _build_id=`$(PRINTF) "0x%b" "$(TGT_ROM_NAME)"` \ --defsym _build_timestamp=$(BUILD_TIMESTAMP) \ -Map $(BIN)/$*.tmp.map $(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
