Re: [Xen-devel] [PATCH v1] tools/firmware: reproducible seabios build

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Fri, Jul 13, 2018 at 01:04:42PM +0200, Olaf Hering wrote:
> The buildsystem of seabios always includes the current time and the
> hostname into the resulting binary. To avoid that, it is required to
> have a file '.version' in the toplevel directory of seabios-dir-remote.
> And it is required to pass EXTRAVERSION= to make because its toplevel
> Makefile does not take EXTRAVERSION from environment.
> 
> Adjust the code to create a '.version' file with fixed content.
> Adjust the code to pass EXTRAVERSION down to make.
> 
> Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
> --
> 
> After commit 1233d253a4 ("firmware/seabios: fix build on systems with non GNU
> toolchains") this change is now hopefully non-controversial.
> ---
>  tools/firmware/Makefile | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
> index 842b48c3d3..b11f1c5970 100644
> --- a/tools/firmware/Makefile
> +++ b/tools/firmware/Makefile
> @@ -30,6 +30,8 @@ seabios-dir:
>       GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) 
> $(SEABIOS_UPSTREAM_REVISION) seabios-dir
>       cp seabios-config seabios-dir/.config;
>       $(MAKE) -C seabios-dir olddefconfig CC=$(SEABIOSCC) LD=$(SEABIOSLD)
> +     rm -f seabios-dir/.version

There is no need to rm -f here because the following > will clear its
content anyway.

> +     echo '$(SEABIOS_UPSTREAM_REVISION)' > seabios-dir/.version
>  
>  .PHONY: all
>  all: $(SUBDIRS-y)
> @@ -130,4 +132,4 @@ subtree-force-update-all:
>       $(MAKE) ovmf-dir-force-update
>  
>  subdir-all-seabios-dir: seabios-dir
> -     $(MAKE) -C $< CC=$(SEABIOSCC) LD=$(SEABIOSLD) PYTHON=$(PYTHON) all;
> +     $(MAKE) -C $< CC=$(SEABIOSCC) LD=$(SEABIOSLD) PYTHON=$(PYTHON) 
> EXTRAVERSION="-Xen" all;

I would like you to define a SEABIOS_EXTRAVERSION somewhere (along side
SEABIOSCC etc) instead of hardcoding -Xen here.

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel