From dbb385de36a8ec61e80a80780605ecfc8bf5577c Mon Sep 17 00:00:00 2001 From: "biao716.wang" Date: Mon, 29 Nov 2021 16:16:33 +0900 Subject: [PATCH] fix spec file rollback the change for non-aarch64 arch Change-Id: I80e84f047b64755361c8f6afa062c43c417364b5 Signed-off-by: biao716.wang --- packaging/qemu.spec | 2 +- roms/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/qemu.spec b/packaging/qemu.spec index 010498c..e1045ba 100644 --- a/packaging/qemu.spec +++ b/packaging/qemu.spec @@ -1291,7 +1291,7 @@ done %endif %endif -#%if %{build_x86_firmware_from_source} +%if %{build_x86_firmware_from_source} #%ifnarch %{ix86} x86_64 #export CC=x86_64-suse-linux-gcc #export LD=x86_64-suse-linux-ld diff --git a/roms/Makefile b/roms/Makefile index 2db995d..a91ffad 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -199,7 +199,7 @@ MESON = meson NINJA = ninja qboot: mkdir -p qboot/build - $(MESON) setup --cross-file qboot/cross.ini $(if $(wildcard qboot/build/meson-private),--wipe,) qboot qboot/build + $(MESON) setup $(if $(wildcard qboot/build/meson-private),--wipe,) qboot qboot/build $(NINJA) -C qboot/build cp qboot/build/bios.bin ../pc-bios/qboot.rom -- 2.7.4