summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbiao716.wang <biao716.wang@samsung.com>2021-11-29 16:16:33 +0900
committerbiao716.wang <biao716.wang@samsung.com>2021-11-29 16:52:36 +0900
commitdbb385de36a8ec61e80a80780605ecfc8bf5577c (patch)
tree7b496d314674d4b9d0f1e880ce382e29440efb22
parentddfac3e4780b0663ef7b2bb896c6249d304be901 (diff)
downloadqemu-dbb385de36a8ec61e80a80780605ecfc8bf5577c.tar.gz
qemu-dbb385de36a8ec61e80a80780605ecfc8bf5577c.tar.bz2
qemu-dbb385de36a8ec61e80a80780605ecfc8bf5577c.zip
fix spec file
rollback the change for non-aarch64 arch Change-Id: I80e84f047b64755361c8f6afa062c43c417364b5 Signed-off-by: biao716.wang <biao716.wang@samsung.com>
-rw-r--r--packaging/qemu.spec2
-rw-r--r--roms/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/qemu.spec b/packaging/qemu.spec
index 010498c6d..e1045bab5 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 2db995dab..a91ffad54 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