summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/qemu/README2
-rw-r--r--system/qemu/qemu.SlackBuild11
-rw-r--r--system/qemu/qemu.info6
3 files changed, 10 insertions, 9 deletions
diff --git a/system/qemu/README b/system/qemu/README
index e5a27928c4..5b84ba720c 100644
--- a/system/qemu/README
+++ b/system/qemu/README
@@ -19,7 +19,7 @@ Add optional vnc support via:
VNC_ENABLE=yes ./qemu.SlackBuild
We patch the installed udev rules to require membership in "users"
-group instead of a custom "kvm" group to uses /dev/kvm. If you prefer
+group instead of a custom "kvm" group to use /dev/kvm. If you prefer
something different, then run the build script like this:
KVMGROUP=group ./qemu.SlackBuild
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index 3d20d9b223..fb68176211 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -33,11 +33,12 @@
# 1.3 03-NOV-2013 updated to 1.6.1
# 1.4 28-APR-2014 updated to 2.0.0 (thanks Callum Davies <calrogman@gmail.com>), added useful options,
# clean ups, libusb version check.
-# 1.4a 04-MAY-2014 fixed typos thanks to sandb0y
+# 1.4a 04-MAY-2014 fixed typos thanks to sandb0y
+# 1.5 10-AUG-2014 updated to new version, watch for legacy "gotchas"
PRGNAM=qemu
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.1.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
KVMGROUP=${KVMGROUP:-users}
@@ -90,7 +91,7 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Remove double CFLAGS
sed -i "s|^\ \ CFLAGS=\"-O2\ | CFLAGS=\"|" configure
@@ -175,7 +176,7 @@ mkdir -p $PKG/lib/udev/rules.d/
sed "s/@GROUP@/$KVMGROUP/" $CWD/65-kvm.rules \
> $PKG/lib/udev/rules.d/65-kvm.rules
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
# create a symlink for qemu-kvm to support aqemu and such frontends
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index eb526198b1..9dbaaf00a6 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,8 @@
PRGNAM="qemu"
-VERSION="2.0.0"
+VERSION="2.1.0"
HOMEPAGE="http://wiki.qemu.org/Main_Page"
-DOWNLOAD="http://wiki.qemu.org/download/qemu-2.0.0.tar.bz2"
-MD5SUM="2790f44fd76da5de5024b4aafeb594c2"
+DOWNLOAD="http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2"
+MD5SUM="6726977292b448cbc7f89998fac6983b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""