summaryrefslogtreecommitdiffstats
path: root/OvmfPkg/build.sh
diff options
context:
space:
mode:
authorjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>2013-01-25 16:22:07 +0000
committerjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>2013-01-25 16:22:07 +0000
commit0aedc542b66ff2c82c7e488f06bf61825602ae1f (patch)
tree4b78bd0e57aa92e2845c4019c161901dccec9a00 /OvmfPkg/build.sh
parent72efe0271fa61bd4ab89995c9f6ef29be51ed20c (diff)
downloadedk2-0aedc542b66ff2c82c7e488f06bf61825602ae1f.tar.gz
edk2-0aedc542b66ff2c82c7e488f06bf61825602ae1f.tar.bz2
edk2-0aedc542b66ff2c82c7e488f06bf61825602ae1f.zip
OvmfPkg: update qemu-executable for IA32
Previously for IA32, we would only try to run qemu. Newer releases of QEMU now have renamed the x86 qemu to qemu-system-i386. Now, we search for: 1. qemu-system-i386 2. qemu-system-x86_64 3. qemu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14101 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'OvmfPkg/build.sh')
-rwxr-xr-xOvmfPkg/build.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index 6751551b10..f64ea91598 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -139,7 +139,16 @@ done
case $PROCESSOR in
IA32)
Processor=Ia32
- QEMU_COMMAND=qemu
+ if [ -x `which qemu-system-i386` ]; then
+ QEMU_COMMAND=qemu-system-i386
+ elif [ -x `which qemu-system-x86_64` ]; then
+ QEMU_COMMAND=qemu-system-x86_64
+ elif [ -x `which qemu` ]; then
+ QEMU_COMMAND=qemu
+ else
+ echo Unable to find QEMU for IA32 architecture!
+ exit 1
+ fi
;;
X64)
Processor=X64