01e9700e70
Update to v2.10.0. Also includes some prep work for SLE15. OBS-URL: https://build.opensuse.org/request/show/519796 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=359
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
From f8462e79c79efa3de96835939d08aed29a5c5213 Mon Sep 17 00:00:00 2001
|
|
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Sat, 19 Nov 2016 08:06:30 -0700
|
|
Subject: [PATCH] roms/Makefile: pass a packaging timestamp to subpackages with
|
|
date info
|
|
|
|
Certain rom subpackages build from qemu git-submodules call the date
|
|
program to include date information in the packaged binaries. This
|
|
causes repeated builds of the package to be different, wkere the only
|
|
real difference is due to the fact that time build timestamp has
|
|
changed. To promote reproducible builds and avoid customers being
|
|
prompted to update packages needlessly, we'll use the timestamp of the
|
|
VERSION file as the packaging timestamp for all packages that build in a
|
|
timestamp for whatever reason.
|
|
|
|
[BR: BSC#1011213]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
roms/Makefile | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/roms/Makefile b/roms/Makefile
|
|
index b5e5a69e91..89d69eb350 100644
|
|
--- a/roms/Makefile
|
|
+++ b/roms/Makefile
|
|
@@ -52,6 +52,12 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org"
|
|
#
|
|
EFIROM ?= $(shell which EfiRom 2>/dev/null)
|
|
|
|
+# NB: Certain SUSE qemu subpackages use date information, but we want
|
|
+# reproducible builds, so we use a pre-determined timestamp, rather
|
|
+# than the current timestamp to acheive consistent results build to
|
|
+# build.
|
|
+PACKAGING_TIMESTAMP = $(shell date -r ../VERSION +%s)
|
|
+
|
|
default:
|
|
@echo "nothing is build by default"
|
|
@echo "available build targets:"
|
|
@@ -106,7 +112,7 @@ build-lgplvgabios:
|
|
|
|
.PHONY: sgabios skiboot
|
|
sgabios:
|
|
- $(MAKE) -C sgabios
|
|
+ $(MAKE) -C sgabios PACKAGING_TIMESTAMP=$(PACKAGING_TIMESTAMP)
|
|
cp sgabios/sgabios.bin ../pc-bios
|
|
|
|
|
|
@@ -126,18 +132,22 @@ efi-rom-%: build-pxe-roms build-efi-roms
|
|
|
|
build-pxe-roms:
|
|
$(MAKE) -C ipxe/src CONFIG=qemu \
|
|
+ PACKAGING_TIMESTAMP=$(PACKAGING_TIMESTAMP) \
|
|
CROSS_COMPILE=$(x86_64_cross_prefix) \
|
|
$(patsubst %,bin/%.rom,$(pxerom_targets))
|
|
|
|
build-efi-roms: build-pxe-roms
|
|
$(MAKE) -C ipxe/src CONFIG=qemu \
|
|
+ PACKAGING_TIMESTAMP=$(PACKAGING_TIMESTAMP) \
|
|
CROSS_COMPILE=$(x86_64_cross_prefix) \
|
|
$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
|
|
$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
|
|
|
|
|
|
slof:
|
|
- $(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
|
|
+ $(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) \
|
|
+ PACKAGING_TIMESTAMP=$(PACKAGING_TIMESTAMP) \
|
|
+ qemu
|
|
cp SLOF/boot_rom.bin ../pc-bios/slof.bin
|
|
|
|
u-boot.e500:
|