edk2/seabios: use common extra version

Bring a bit more consistency into the naming.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20240327102448.61877-4-kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2024-03-27 11:24:47 +01:00
parent 6494a08d10
commit 2c4eb439dc

View File

@ -41,8 +41,8 @@ x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
riscv32_cross_prefix := $(call find-cross-prefix,riscv32) riscv32_cross_prefix := $(call find-cross-prefix,riscv32)
riscv64_cross_prefix := $(call find-cross-prefix,riscv64) riscv64_cross_prefix := $(call find-cross-prefix,riscv64)
# tag our seabios builds # tag our firmware builds
SEABIOS_EXTRAVERSION="-prebuilt.qemu.org" FIRMWARE_EXTRAVERSION = -prebuilt.qemu.org
# #
# EfiRom utility is shipped with edk2 / tianocore, in BaseTools/ # EfiRom utility is shipped with edk2 / tianocore, in BaseTools/
@ -93,12 +93,12 @@ build-seabios-config-%: config.%
mkdir -p seabios/builds/$* mkdir -p seabios/builds/$*
cp $< seabios/builds/$*/.config cp $< seabios/builds/$*/.config
$(MAKE) -C seabios \ $(MAKE) -C seabios \
EXTRAVERSION=$(SEABIOS_EXTRAVERSION) \ EXTRAVERSION=$(FIRMWARE_EXTRAVERSION) \
CROSS_PREFIX=$(x86_64_cross_prefix) \ CROSS_PREFIX=$(x86_64_cross_prefix) \
KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig
$(MAKE) -C seabios \ $(MAKE) -C seabios \
EXTRAVERSION=$(SEABIOS_EXTRAVERSION) \ EXTRAVERSION=$(FIRMWARE_EXTRAVERSION) \
CROSS_PREFIX=$(x86_64_cross_prefix) \ CROSS_PREFIX=$(x86_64_cross_prefix) \
KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
OUT=$(CURDIR)/seabios/builds/$*/ all OUT=$(CURDIR)/seabios/builds/$*/ all
@ -159,7 +159,7 @@ edk2-version: edk2
efi: edk2-version efi: edk2-version
$(PYTHON) edk2-build.py --config edk2-build.config \ $(PYTHON) edk2-build.py --config edk2-build.config \
--version-override "$(EDK2_STABLE)-for-qemu" \ --version-override "$(EDK2_STABLE)$(FIRMWARE_EXTRAVERSION)" \
--release-date "$(EDK2_DATE)" \ --release-date "$(EDK2_DATE)" \
--silent --no-logs --silent --no-logs
rm -f ../pc-bios/edk2-*.fd.bz2 rm -f ../pc-bios/edk2-*.fd.bz2