File xen.tools-firmware-pass-EXTRAVERSION-to-seabios... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File xen.tools-firmware-pass-EXTRAVERSION-to-seabios-build.patch of Package xen

From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 26 May 2017 12:41:05 +0000
Subject: tools/firmware: pass EXTRAVERSION to seabios build

Having a fixed version string in the seabios binary is cumbersome:
- it is required to write something to '.version' in the toplevel
  directory of seabios-dir-remove.
- 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@aepfle.de>
---
 tools/firmware/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -14,37 +14,39 @@ SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
 SUBDIRS-y += hvmloader
 
 LD32BIT-$(CONFIG_FreeBSD) := LD32BIT_FLAG=-melf_i386_fbsd
 
 ovmf-dir:
 	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir
 	cp ovmf-makefile ovmf-dir/Makefile;
 
 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
+	rm -f seabios-dir/.version
+	echo '$(SEABIOS_UPSTREAM_REVISION)' > seabios-dir/.version
 
 .PHONY: all
 all: $(SUBDIRS-y)
 ifeq ($(CONFIG_ROMBIOS),y)
 	@set -e; if [ $$((`( bcc -v 2>&1 | grep version || echo 0.0.0 ) | cut -d' ' -f 3 | awk -F. '{ printf "0x%02x%02x%02x", $$1, $$2, $$3}'`)) -lt $$((0x00100e)) ] ; then \
 	echo "==========================================================================="; \
 	echo "Require dev86 rpm or bin86 & bcc debs version >= 0.16.14 to build firmware!"; \
 	echo "(visit http://www.debath.co.uk/dev86/ for more information)"; \
 	echo "==========================================================================="; \
 	false ; \
 	fi
 endif
-	$(MAKE) $(LD32BIT-y) CC=$(CC) PYTHON=$(PYTHON) subdirs-$@
+	$(MAKE) $(LD32BIT-y) CC=$(CC) PYTHON=$(PYTHON) EXTRAVERSION="-Xen" subdirs-$@
 
 
 .PHONY: install
 install: all
 	[ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR)
 	[ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR)
 ifeq ($(CONFIG_SEABIOS),y)
 	$(INSTALL_DATA) seabios-dir/out/bios.bin $(INST_DIR)/seabios.bin
 endif
 ifeq ($(CONFIG_OVMF),y)
 	$(INSTALL_DATA) ovmf-dir/ovmf.bin $(INST_DIR)/ovmf.bin
 endif

Places

File xen.tools-firmware-pass-EXTRAVERSION-to-seabios-build.patch of Package xen

Places