Date: Friday, May 10, 2013 @ 23:11:40 Author: tomegun Revision: 185081
archrelease: copy trunk to staging-i686, staging-x86_64 Added: qemu/repos/staging-i686/ qemu/repos/staging-i686/65-kvm.rules (from rev 185080, qemu/trunk/65-kvm.rules) qemu/repos/staging-i686/PKGBUILD (from rev 185080, qemu/trunk/PKGBUILD) qemu/repos/staging-i686/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch (from rev 185080, qemu/trunk/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch) qemu/repos/staging-i686/qemu.install (from rev 185080, qemu/trunk/qemu.install) qemu/repos/staging-x86_64/ qemu/repos/staging-x86_64/65-kvm.rules (from rev 185080, qemu/trunk/65-kvm.rules) qemu/repos/staging-x86_64/PKGBUILD (from rev 185080, qemu/trunk/PKGBUILD) qemu/repos/staging-x86_64/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch (from rev 185080, qemu/trunk/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch) qemu/repos/staging-x86_64/qemu.install (from rev 185080, qemu/trunk/qemu.install) ----------------------------------------------------------------------+ staging-i686/65-kvm.rules | 1 staging-i686/PKGBUILD | 62 ++++++++++ staging-i686/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch | 30 ++++ staging-i686/qemu.install | 25 ++++ staging-x86_64/65-kvm.rules | 1 staging-x86_64/PKGBUILD | 62 ++++++++++ staging-x86_64/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch | 30 ++++ staging-x86_64/qemu.install | 25 ++++ 8 files changed, 236 insertions(+) Copied: qemu/repos/staging-i686/65-kvm.rules (from rev 185080, qemu/trunk/65-kvm.rules) =================================================================== --- staging-i686/65-kvm.rules (rev 0) +++ staging-i686/65-kvm.rules 2013-05-10 21:11:40 UTC (rev 185081) @@ -0,0 +1 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" Copied: qemu/repos/staging-i686/PKGBUILD (from rev 185080, qemu/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2013-05-10 21:11:40 UTC (rev 185081) @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +pkgname=qemu +pkgver=1.4.1 +pkgrel=3 +pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +url="http://wiki.qemu.org/Index.html" +makedepends=('texi2html' 'perl' 'python2') +depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng') +backup=('etc/qemu/target-x86_64.conf') +install=qemu.install +source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 + doc-fix-sheepdog-invalid-texi-table-list-syntax.patch + 65-kvm.rules) +replaces=('qemu-kvm') +options=(!strip) + +prepare() +{ + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld + # fix building with tex version 5.0 + # https://bugs.launchpad.net/qemu/+bug/1130533 + patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch +} + +build () +{ + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ + --python=/usr/bin/python2 \ + --audio-card-list=ac97,sb16,es1370,hda \ + --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install + rm "${pkgdir}/usr/share/qemu/bios.bin" + + install -D -m644 "${srcdir}/65-kvm.rules" \ + "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules" + # bridge_helper needs suid + # https://bugs.archlinux.org/task/32565 + chmod u+s "${pkgdir}/usr/lib/qemu/qemu-bridge-helper" + # add sample config + echo "allow br0" > ${pkgdir}/etc/qemu/bridge.conf.sample + # strip scripts directory + find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done + +} +md5sums=('eb2d696956324722b5ecfa46e41f9a75' + 'b431782f310bfc6af4ef21a8068f866b' + 'b316a066d2f1bb57d8f5b7ea1d0d1caf') Copied: qemu/repos/staging-i686/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch (from rev 185080, qemu/trunk/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch) =================================================================== --- staging-i686/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch (rev 0) +++ staging-i686/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch 2013-05-10 21:11:40 UTC (rev 185081) @@ -0,0 +1,30 @@ +diff --git a/qemu-options.hx b/qemu-options.hx +index 4bc9c85..3af60bf 100644 +--- a/qemu-options.hx ++++ b/qemu-options.hx +@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or remote networked + devices. + + Syntax for specifying a sheepdog device +-@table @list +-``sheepdog:<vdiname>'' +- +-``sheepdog:<vdiname>:<snapid>'' +- +-``sheepdog:<vdiname>:<tag>'' +- +-``sheepdog:<host>:<port>:<vdiname>'' +- +-``sheepdog:<host>:<port>:<vdiname>:<snapid>'' +- +-``sheepdog:<host>:<port>:<vdiname>:<tag>'' ++@table @code ++@item sheepdog:<vdiname> ++@item sheepdog:<vdiname>:<snapid> ++@item sheepdog:<vdiname>:<tag> ++@item sheepdog:<host>:<port>:<vdiname> ++@item sheepdog:<host>:<port>:<vdiname>:<snapid> ++@item sheepdog:<host>:<port>:<vdiname>:<tag> + @end table + + Example Copied: qemu/repos/staging-i686/qemu.install (from rev 185080, qemu/trunk/qemu.install) =================================================================== --- staging-i686/qemu.install (rev 0) +++ staging-i686/qemu.install 2013-05-10 21:11:40 UTC (rev 185081) @@ -0,0 +1,25 @@ +# kvm: the new package version +post_install() { + # + groupadd kvm -f -g 78 + echo ">>> PLEASE READ FOR KVM USAGE!" + echo ">>> Add yourself to the group 'kvm'." +} + +post_upgrade() { + if [ "$(vercmp $2 0.11)" -lt 0 ]; then + echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module" + echo "is no longer supported and will be removed from the repositories. You" + echo "can safely uninstall it from your system." + fi + if [ "$(vercmp $2 1.3.1)" -lt 0 ]; then + echo "With the release of qemu 1.3.0, qemu-kvm binary is removed." + echo "You need to change the emulator path, if you use libvirt by using:" + echo "'virsh edit <vm-name>'" + fi +} + +post_remove() { + # + groupdel kvm +} Copied: qemu/repos/staging-x86_64/65-kvm.rules (from rev 185080, qemu/trunk/65-kvm.rules) =================================================================== --- staging-x86_64/65-kvm.rules (rev 0) +++ staging-x86_64/65-kvm.rules 2013-05-10 21:11:40 UTC (rev 185081) @@ -0,0 +1 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" Copied: qemu/repos/staging-x86_64/PKGBUILD (from rev 185080, qemu/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2013-05-10 21:11:40 UTC (rev 185081) @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +pkgname=qemu +pkgver=1.4.1 +pkgrel=3 +pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +url="http://wiki.qemu.org/Index.html" +makedepends=('texi2html' 'perl' 'python2') +depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng') +backup=('etc/qemu/target-x86_64.conf') +install=qemu.install +source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 + doc-fix-sheepdog-invalid-texi-table-list-syntax.patch + 65-kvm.rules) +replaces=('qemu-kvm') +options=(!strip) + +prepare() +{ + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld + # fix building with tex version 5.0 + # https://bugs.launchpad.net/qemu/+bug/1130533 + patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch +} + +build () +{ + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ + --python=/usr/bin/python2 \ + --audio-card-list=ac97,sb16,es1370,hda \ + --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install + rm "${pkgdir}/usr/share/qemu/bios.bin" + + install -D -m644 "${srcdir}/65-kvm.rules" \ + "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules" + # bridge_helper needs suid + # https://bugs.archlinux.org/task/32565 + chmod u+s "${pkgdir}/usr/lib/qemu/qemu-bridge-helper" + # add sample config + echo "allow br0" > ${pkgdir}/etc/qemu/bridge.conf.sample + # strip scripts directory + find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done + +} +md5sums=('eb2d696956324722b5ecfa46e41f9a75' + 'b431782f310bfc6af4ef21a8068f866b' + 'b316a066d2f1bb57d8f5b7ea1d0d1caf') Copied: qemu/repos/staging-x86_64/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch (from rev 185080, qemu/trunk/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch) =================================================================== --- staging-x86_64/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch (rev 0) +++ staging-x86_64/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch 2013-05-10 21:11:40 UTC (rev 185081) @@ -0,0 +1,30 @@ +diff --git a/qemu-options.hx b/qemu-options.hx +index 4bc9c85..3af60bf 100644 +--- a/qemu-options.hx ++++ b/qemu-options.hx +@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or remote networked + devices. + + Syntax for specifying a sheepdog device +-@table @list +-``sheepdog:<vdiname>'' +- +-``sheepdog:<vdiname>:<snapid>'' +- +-``sheepdog:<vdiname>:<tag>'' +- +-``sheepdog:<host>:<port>:<vdiname>'' +- +-``sheepdog:<host>:<port>:<vdiname>:<snapid>'' +- +-``sheepdog:<host>:<port>:<vdiname>:<tag>'' ++@table @code ++@item sheepdog:<vdiname> ++@item sheepdog:<vdiname>:<snapid> ++@item sheepdog:<vdiname>:<tag> ++@item sheepdog:<host>:<port>:<vdiname> ++@item sheepdog:<host>:<port>:<vdiname>:<snapid> ++@item sheepdog:<host>:<port>:<vdiname>:<tag> + @end table + + Example Copied: qemu/repos/staging-x86_64/qemu.install (from rev 185080, qemu/trunk/qemu.install) =================================================================== --- staging-x86_64/qemu.install (rev 0) +++ staging-x86_64/qemu.install 2013-05-10 21:11:40 UTC (rev 185081) @@ -0,0 +1,25 @@ +# kvm: the new package version +post_install() { + # + groupadd kvm -f -g 78 + echo ">>> PLEASE READ FOR KVM USAGE!" + echo ">>> Add yourself to the group 'kvm'." +} + +post_upgrade() { + if [ "$(vercmp $2 0.11)" -lt 0 ]; then + echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module" + echo "is no longer supported and will be removed from the repositories. You" + echo "can safely uninstall it from your system." + fi + if [ "$(vercmp $2 1.3.1)" -lt 0 ]; then + echo "With the release of qemu 1.3.0, qemu-kvm binary is removed." + echo "You need to change the emulator path, if you use libvirt by using:" + echo "'virsh edit <vm-name>'" + fi +} + +post_remove() { + # + groupdel kvm +}