summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Skalkotos <skalkoto@gmail.com>2011-05-19 10:15:33 -0500
committerRobby Workman <rworkman@slackbuilds.org>2011-05-19 10:15:33 -0500
commit3a581f73806634bbce410dd97f92ba0c6cde0327 (patch)
treef1fe81b92d99caf82dd9b1786edfa88ea2169ae9
parent2f37d2ee5f4bdfe9d208619a3f0fa82c397ede33 (diff)
downloadslackbuilds-3a581f73806634bbce410dd97f92ba0c6cde0327.tar.gz
system/qemu-kvm: Build only x86 and x86_64 stuff by default
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--system/qemu-kvm/README8
-rw-r--r--system/qemu-kvm/qemu-kvm.SlackBuild18
2 files changed, 19 insertions, 7 deletions
diff --git a/system/qemu-kvm/README b/system/qemu-kvm/README
index 1b864b7335..4c9a99a300 100644
--- a/system/qemu-kvm/README
+++ b/system/qemu-kvm/README
@@ -19,3 +19,11 @@ After package installation, make sure you have the KVMGROUP present on
your system and that all desired users are members of that group.
Don't forget to load the KVM-INTEL or KVM-AMD module depending on your
processor.
+
+The script builds only x86 and x86_64 Linux Target CPU emulators by default.
+If you need to emulate all target CPUs, set BUILD_ARCH to "all" but be
+aware that the compilation will take a lot longer, and you should really
+be using plain "qemu" for the others (since they can't use the KVM stuff
+anyway. The default "x86_64" value works fine for for 32-bit or 64-bit
+QEMU-KVM hosts providing full system emulation supporting Linux, BSD, and
+Windows guests.
diff --git a/system/qemu-kvm/qemu-kvm.SlackBuild b/system/qemu-kvm/qemu-kvm.SlackBuild
index 1c2768a1de..7902c6f218 100644
--- a/system/qemu-kvm/qemu-kvm.SlackBuild
+++ b/system/qemu-kvm/qemu-kvm.SlackBuild
@@ -23,7 +23,7 @@
PRGNAM=qemu-kvm
VERSION=${VERSION:-0.14.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
KVMGROUP=${KVMGROUP:-kvm}
@@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then
esac
fi
-# The script is set to build all possible Linux Target CPU emulators by default.
+# The script builds only x86 and x86_64 Linux Target CPU emulators by default.
# Available Linux Target CPUs for full system emulation are:
# i386 x86_64 arm cris m68k microblaze mips mipsel mips64 mips64el
# ppc ppcemb ppc64 sh4 sh4eb sparc sparc64
@@ -44,11 +44,15 @@ fi
# i386 x86_64 alpha arm armeb cris m68k microblaze mips mipsel
# ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc64 sparc32plus
#
-# To reduce compile time and package size modify the BUILD ARCH line below
-# from BUILD_ARCH="" to BUILD_ARCH="x86_64" if you DO NOT need to emulate
-# all target CPUs. This works fine for 32-bit or 64-bit QEMU-KVM hosts
-# providing full system emulation supporting Linux, BSD and Windows guests.
-BUILD_ARCH=""
+# If you need to emulate all target CPUs, set BUILD_ARCH to "all" but be
+# aware that the compilation will take a lot longer, and you should really
+# be using plain "qemu" for the others (since they can't use the KVM stuff
+# anyway. The default "x86_64" value works fine for for 32-bit or 64-bit
+# QEMU-KVM hosts providing full system emulation supporting Linux, BSD, and
+# Windows guests.
+
+BUILD_ARCH=${BUILD_ARCH:-x86_64}
+[ "$BUILD_ARCH" = "all" ] && unset BUILD_ARCH
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}