On Montag, 30. Dezember 2024 23:28:42 CET Maximilian Engelhardt wrote: > On Montag, 30. Dezember 2024 22:38:24 CET Andrew Cooper wrote: > > On 30/12/2024 9:00 pm, Maximilian Engelhardt wrote: > > > Use the solution described in [1] to replace the call to the 'date' > > > command with a version that uses SOURCE_DATE_EPOCH if available. This > > > is needed for reproducible builds. > > > > > > The -d "@..." syntax was introduced in GNU date about 2005 (but only > > > added to the docuemntation in 2011), so I assume a version supporting > > > this syntax is available, if SOURCE_DATE_EPOCH is defined. If > > > SOURCE_DATE_EPOCH is not defined, nothing changes with respect to the > > > current behavior. > > > > > > [1] https://reproducible-builds.org/docs/source-date-epoch/ > > > > > > Signed-off-by: Maximilian Engelhardt <m...@daemonizer.de> > > > --- > > > > > > docs/Makefile | 8 +++++++- > > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > > > diff --git a/docs/Makefile b/docs/Makefile > > > index b30cc619f8..beba02a94f 100644 > > > --- a/docs/Makefile > > > +++ b/docs/Makefile > > > @@ -3,7 +3,13 @@ include $(XEN_ROOT)/Config.mk > > > > > > -include $(XEN_ROOT)/config/Docs.mk > > > > > > VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print- directory > > > xenversion)> > > > > > > -DATE := $(shell date +%Y-%m-%d) > > > + > > > +DATE_FMT := +%Y-%m-%d > > > +ifdef SOURCE_DATE_EPOCH > > > +DATE := $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" > > > "$(DATE_FMT)" > > > 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" > > > 2>/dev/null || date -u "$(DATE_FMT)") +else > > > +DATE := $(shell date "$(DATE_FMT)") > > > +endif > > > > > > DOC_ARCHES := arm x86_32 x86_64 > > > MAN_SECTIONS := 1 5 7 8 > > > > While this looks fine for docs, there's another (identical) use of date > > in tools/firmware/hvmloader/Makefile, as well as some differing uses to > > construct XEN_BUILD_{DATE,TIME}. INSTALL talks about VGABIOS_REL_DATE > > too. > > > > Does something like this work for you? It seems to DTRT for SMBIOS. It > > needs adapting a bit more for vgabios and Xen, but I think having one > > common $(date) is going to be better than ad-hoc ones over the tree. > > > > ~Andrew > > Hi Andrew, > > Thanks for your quick reply. Your patch looks fine to me. You can add my > Tested-by. > > We currently use "export XEN_BUILD_{DATE,TIME}=...", "export > SMBIOS_REL_DATE=..." and "export VGABIOS_REL_DATE=..." for building xen in > Debian, so we did not run into reproducibility problems with these. But > having them combined to all use SOURCE_DATE_EPOCH if available sounds like > a good idea and would also benefit other downstream users. > > Maxi
Hi Andrew,
I extended your patch to also cover the other uses of date. Please check if
this look reasonable as I'm not an expert in makefiles. It seems to DTRT in
the cases I tested.
What I changed compared to your patch:
* Add LC_ALL=C to all date commands. This was also missing in my original
patch, but I think it's a good thing to do and XEN_BUILD_{DATE,TIME} already
do it.
* Change the quoting to allow calling the date command without any additional
(formatting) arguments.
* Add an include of Config.mk to tools/firmware/vgabios/Makefile and moved the
definition of XEN_BUILD_{DATE,TIME} further down in xen/Makefile to have the
newly defined date wrapper available.
Does this look reasonable or are there parts that should be done differently?
Thanks,
Maxidiff --git a/Config.mk b/Config.mk index fa0414055b..9188fc9053 100644 --- a/Config.mk +++ b/Config.mk @@ -141,6 +141,14 @@ export XEN_HAS_BUILD_ID=y build_id_linker := --build-id=sha1 endif +# Wrap date(1) to use SOURCE_DATE_EPOCH if set the environment. +# See https://reproducible-builds.org/docs/source-date-epoch/ +ifdef SOURCE_DATE_EPOCH +date = $(shell LC_ALL=C date -u -d "@$(SOURCE_DATE_EPOCH)" $(1) 2>/dev/null || LC_ALL=C date -u -r "$(SOURCE_DATE_EPOCH)" $(1) 2>/dev/null || LC_ALL=C date -u $(1)) +else +date = $(shell LC_ALL=C date $(1)) +endif + define buildmakevars2shellvars export PREFIX="$(prefix)"; \ export XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)"; \ diff --git a/docs/Makefile b/docs/Makefile index b30cc619f8..ca9fd726d3 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Docs.mk VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) -DATE := $(shell date +%Y-%m-%d) +DATE := $(call date,"+%Y-%m-%d") DOC_ARCHES := arm x86_32 x86_64 MAN_SECTIONS := 1 5 7 8 diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index c7bc400657..cc5dc00498 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -23,7 +23,7 @@ include $(XEN_ROOT)/tools/firmware/Rules.mk ld-option = $(shell if $(LD) -v $(1) >/dev/null 2>&1; then echo y; else echo n; fi) # SMBIOS spec requires format mm/dd/yyyy -SMBIOS_REL_DATE ?= $(shell date +%m/%d/%Y) +SMBIOS_REL_DATE ?= $(call date,"+%m/%d/%Y") CFLAGS += $(CFLAGS_xeninclude) -fno-pic -mregparm=3 diff --git a/tools/firmware/vgabios/Makefile b/tools/firmware/vgabios/Makefile index 3284812fde..db5a2624be 100644 --- a/tools/firmware/vgabios/Makefile +++ b/tools/firmware/vgabios/Makefile @@ -1,3 +1,6 @@ +XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/Config.mk + CC = gcc GCC = gcc @@ -5,7 +8,7 @@ BCC = bcc AS86 = as86 RELEASE = `pwd | sed "s-.*/--"` -VGABIOS_REL_DATE ?= `date '+%d %b %Y'` +VGABIOS_REL_DATE ?= $(call date,"+%d %b %Y") RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios//" | sed "s/-//"` VGABIOS_DATE = "-DVGABIOS_DATE=\"$(VGABIOS_REL_DATE)\"" diff --git a/xen/Makefile b/xen/Makefile index 2e1a925c84..a2d0795cde 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -14,15 +14,11 @@ export XEN_WHOAMI ?= $(USER) ifeq ($(origin XEN_DOMAIN), undefined) export XEN_DOMAIN := $(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown])) endif -ifeq ($(origin XEN_BUILD_DATE), undefined) -export XEN_BUILD_DATE := $(shell LC_ALL=C date) -endif -ifeq ($(origin XEN_BUILD_TIME), undefined) -export XEN_BUILD_TIME := $(shell LC_ALL=C date +%T) -endif ifeq ($(origin XEN_BUILD_HOST), undefined) export XEN_BUILD_HOST := $(shell hostname) endif +# XEN_BUILD_DATE and XEN_BUILD_TIME are set further down, as they depend on +# Config.mk for SOURCE_DATE_EPOCH handling. # Best effort attempt to find a python interpreter, defaulting to Python 3 if # available. Fall back to just `python`. @@ -250,6 +246,13 @@ SRCARCH := $(shell echo $(ARCH) | \ -e 's/riscv.*/riscv/g' -e 's/ppc.*/ppc/g') export ARCH SRCARCH +ifeq ($(origin XEN_BUILD_DATE), undefined) +export XEN_BUILD_DATE := $(call date) +endif +ifeq ($(origin XEN_BUILD_TIME), undefined) +export XEN_BUILD_TIME := $(call date,"+%T") +endif + export CONFIG_SHELL := $(SHELL) export CC CXX LD NM OBJCOPY OBJDUMP ADDR2LINE export YACC = $(if $(BISON),$(BISON),bison)
signature.asc
Description: This is a digitally signed message part.
