[arch-commits] Commit in qemu/repos (16 files)
Tobias Powalowski
tpowa at archlinux.org
Fri Sep 26 09:26:00 UTC 2014
Date: Friday, September 26, 2014 @ 11:25:59
Author: tpowa
Revision: 223030
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qemu/repos/extra-i686/2.0.0-usb-stack.patch
(from rev 223029, qemu/trunk/2.0.0-usb-stack.patch)
qemu/repos/extra-i686/65-kvm.rules
(from rev 223029, qemu/trunk/65-kvm.rules)
qemu/repos/extra-i686/PKGBUILD
(from rev 223029, qemu/trunk/PKGBUILD)
qemu/repos/extra-i686/qemu.install
(from rev 223029, qemu/trunk/qemu.install)
qemu/repos/extra-x86_64/2.0.0-usb-stack.patch
(from rev 223029, qemu/trunk/2.0.0-usb-stack.patch)
qemu/repos/extra-x86_64/65-kvm.rules
(from rev 223029, qemu/trunk/65-kvm.rules)
qemu/repos/extra-x86_64/PKGBUILD
(from rev 223029, qemu/trunk/PKGBUILD)
qemu/repos/extra-x86_64/qemu.install
(from rev 223029, qemu/trunk/qemu.install)
Deleted:
qemu/repos/extra-i686/2.0.0-usb-stack.patch
qemu/repos/extra-i686/65-kvm.rules
qemu/repos/extra-i686/PKGBUILD
qemu/repos/extra-i686/qemu.install
qemu/repos/extra-x86_64/2.0.0-usb-stack.patch
qemu/repos/extra-x86_64/65-kvm.rules
qemu/repos/extra-x86_64/PKGBUILD
qemu/repos/extra-x86_64/qemu.install
------------------------------------+
/2.0.0-usb-stack.patch | 72 ++++++++++++
/65-kvm.rules | 4
/PKGBUILD | 200 +++++++++++++++++++++++++++++++++++
/qemu.install | 46 ++++++++
extra-i686/2.0.0-usb-stack.patch | 36 ------
extra-i686/65-kvm.rules | 2
extra-i686/PKGBUILD | 100 -----------------
extra-i686/qemu.install | 23 ----
extra-x86_64/2.0.0-usb-stack.patch | 36 ------
extra-x86_64/65-kvm.rules | 2
extra-x86_64/PKGBUILD | 100 -----------------
extra-x86_64/qemu.install | 23 ----
12 files changed, 322 insertions(+), 322 deletions(-)
Deleted: extra-i686/2.0.0-usb-stack.patch
===================================================================
--- extra-i686/2.0.0-usb-stack.patch 2014-09-26 06:54:23 UTC (rev 223029)
+++ extra-i686/2.0.0-usb-stack.patch 2014-09-26 09:25:59 UTC (rev 223030)
@@ -1,36 +0,0 @@
-Correct post load checks:
-1. dev->setup_len == sizeof(dev->data_buf)
- seems fine, no need to fail migration
-2. When state is DATA, passing index > len
- will cause memcpy with negative length,
- resulting in heap overflow
-
-First of the issues was reported by dgilbert.
-
-Reported-by: "Dr. David Alan Gilbert" <dgilbert <at> redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst <at> redhat.com>
----
-
-changes from v1:
-- drop state check
-- lightly tested
-
- hw/usb/bus.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/usb/bus.c b/hw/usb/bus.c
-index e48b19f..ff1dfe6 100644
---- a/hw/usb/bus.c
-+++ b/hw/usb/bus.c
- <at> <at> -51,8 +51,8 <at> <at> static int usb_device_post_load(void *opaque, int version_id)
- }
- if (dev->setup_index < 0 ||
- dev->setup_len < 0 ||
-- dev->setup_index >= sizeof(dev->data_buf) ||
-- dev->setup_len >= sizeof(dev->data_buf)) {
-+ dev->setup_index > dev->setup_len ||
-+ dev->setup_len > sizeof(dev->data_buf)) {
- return -EINVAL;
- }
- return 0;
-
Copied: qemu/repos/extra-i686/2.0.0-usb-stack.patch (from rev 223029, qemu/trunk/2.0.0-usb-stack.patch)
===================================================================
--- extra-i686/2.0.0-usb-stack.patch (rev 0)
+++ extra-i686/2.0.0-usb-stack.patch 2014-09-26 09:25:59 UTC (rev 223030)
@@ -0,0 +1,36 @@
+Correct post load checks:
+1. dev->setup_len == sizeof(dev->data_buf)
+ seems fine, no need to fail migration
+2. When state is DATA, passing index > len
+ will cause memcpy with negative length,
+ resulting in heap overflow
+
+First of the issues was reported by dgilbert.
+
+Reported-by: "Dr. David Alan Gilbert" <dgilbert <at> redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst <at> redhat.com>
+---
+
+changes from v1:
+- drop state check
+- lightly tested
+
+ hw/usb/bus.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/usb/bus.c b/hw/usb/bus.c
+index e48b19f..ff1dfe6 100644
+--- a/hw/usb/bus.c
++++ b/hw/usb/bus.c
+ <at> <at> -51,8 +51,8 <at> <at> static int usb_device_post_load(void *opaque, int version_id)
+ }
+ if (dev->setup_index < 0 ||
+ dev->setup_len < 0 ||
+- dev->setup_index >= sizeof(dev->data_buf) ||
+- dev->setup_len >= sizeof(dev->data_buf)) {
++ dev->setup_index > dev->setup_len ||
++ dev->setup_len > sizeof(dev->data_buf)) {
+ return -EINVAL;
+ }
+ return 0;
+
Deleted: extra-i686/65-kvm.rules
===================================================================
--- extra-i686/65-kvm.rules 2014-09-26 06:54:23 UTC (rev 223029)
+++ extra-i686/65-kvm.rules 2014-09-26 09:25:59 UTC (rev 223030)
@@ -1,2 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
-KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
Copied: qemu/repos/extra-i686/65-kvm.rules (from rev 223029, qemu/trunk/65-kvm.rules)
===================================================================
--- extra-i686/65-kvm.rules (rev 0)
+++ extra-i686/65-kvm.rules 2014-09-26 09:25:59 UTC (rev 223030)
@@ -0,0 +1,2 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-09-26 06:54:23 UTC (rev 223029)
+++ extra-i686/PKGBUILD 2014-09-26 09:25:59 UTC (rev 223030)
@@ -1,100 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=('qemu' 'libcacard')
-pkgver=2.1.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://wiki.qemu.org/Index.html"
-makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
- 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
- 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
- 'usbredir')
-replaces=('qemu-kvm')
-options=(!strip)
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
- 65-kvm.rules
- 2.0.0-usb-stack.patch)
-
-prepare ()
-{
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/2.0.0-usb-stack.patch"
-}
-
-build ()
-{
- cd "${srcdir}/${pkgname}-${pkgver}"
- # qemu vs. make 4 == bad
- export ARFLAGS="rv"
- # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
-
- # gtk gui breaks keymappings at the moment
- ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
- --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
- --enable-docs --libexecdir=/usr/lib/qemu \
- --disable-gtk --enable-linux-aio --enable-seccomp \
- --enable-spice --localstatedir=/var \
- --enable-tpm
- make V=99
-}
-
-package_qemu() {
- pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
- depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
- 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
- 'libiscsi' 'libcacard' 'spice' 'usbredir')
- backup=('etc/qemu/target-x86_64.conf')
- install=qemu.install
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
- # provided by seabios package
- rm "${pkgdir}/usr/share/qemu/bios.bin"
- rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml"
- rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml"
- rm "${pkgdir}/usr/share/qemu/bios-256k.bin"
- rm "${pkgdir}/usr/share/qemu/vgabios-cirrus.bin"
- rm "${pkgdir}/usr/share/qemu/vgabios-qxl.bin"
- rm "${pkgdir}/usr/share/qemu/vgabios-stdvga.bin"
- rm "${pkgdir}/usr/share/qemu/vgabios-vmware.bin"
-
- # remove conflicting /var/run directory
- rm -r "${pkgdir}/var"
- 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
- # remove libcacard files
- rm -rf ${pkgdir}/usr/include/cacard
- rm -rf ${pkgdir}/usr/lib/libcacard*
- rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc
- rm -rf ${pkgdir}/usr/bin/vscclient
-}
-
-package_libcacard() {
- pkgdesc="Common Access Card (CAC) Emulation"
- options=('strip')
- depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2' 'glib2')
- mkdir -p ${pkgdir}/usr/bin
- mkdir -p ${pkgdir}/usr/lib/pkgconfig
- mkdir -p ${pkgdir}/usr/include/cacard
- cp -a ${srcdir}/qemu-${pkgver}/libcacard/*.h ${pkgdir}/usr/include/cacard/
- cp -a ${srcdir}/qemu-${pkgver}/.libs/libcacard.so* ${pkgdir}/usr/lib/
- cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
- cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
-}
-md5sums=('0ff197c4ed4b695620bc4734e77c888f'
- '33ab286a20242dda7743a900f369d68a'
- 'f98a479ec4e656403f5f05b1914f7f1f')
Copied: qemu/repos/extra-i686/PKGBUILD (from rev 223029, qemu/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-09-26 09:25:59 UTC (rev 223030)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=('qemu' 'libcacard')
+pkgver=2.1.2
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url="http://wiki.qemu.org/Index.html"
+makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+ 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+ 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
+ 'usbredir')
+replaces=('qemu-kvm')
+options=(!strip)
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+ 65-kvm.rules
+ 2.0.0-usb-stack.patch)
+
+prepare ()
+{
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/2.0.0-usb-stack.patch"
+}
+
+build ()
+{
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # qemu vs. make 4 == bad
+ export ARFLAGS="rv"
+ # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
+
+ # gtk gui breaks keymappings at the moment
+ ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
+ --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
+ --enable-docs --libexecdir=/usr/lib/qemu \
+ --disable-gtk --enable-linux-aio --enable-seccomp \
+ --enable-spice --localstatedir=/var \
+ --enable-tpm
+ make V=99
+}
+
+package_qemu() {
+ pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+ depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+ 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+ 'libiscsi' 'libcacard' 'spice' 'usbredir')
+ backup=('etc/qemu/target-x86_64.conf')
+ install=qemu.install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
+ # provided by seabios package
+ rm "${pkgdir}/usr/share/qemu/bios.bin"
+ rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml"
+ rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml"
+ rm "${pkgdir}/usr/share/qemu/bios-256k.bin"
+ rm "${pkgdir}/usr/share/qemu/vgabios-cirrus.bin"
+ rm "${pkgdir}/usr/share/qemu/vgabios-qxl.bin"
+ rm "${pkgdir}/usr/share/qemu/vgabios-stdvga.bin"
+ rm "${pkgdir}/usr/share/qemu/vgabios-vmware.bin"
+
+ # remove conflicting /var/run directory
+ rm -r "${pkgdir}/var"
+ 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
+ # remove libcacard files
+ rm -rf ${pkgdir}/usr/include/cacard
+ rm -rf ${pkgdir}/usr/lib/libcacard*
+ rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc
+ rm -rf ${pkgdir}/usr/bin/vscclient
+}
+
+package_libcacard() {
+ pkgdesc="Common Access Card (CAC) Emulation"
+ options=('strip')
+ depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2' 'glib2')
+ mkdir -p ${pkgdir}/usr/bin
+ mkdir -p ${pkgdir}/usr/lib/pkgconfig
+ mkdir -p ${pkgdir}/usr/include/cacard
+ cp -a ${srcdir}/qemu-${pkgver}/libcacard/*.h ${pkgdir}/usr/include/cacard/
+ cp -a ${srcdir}/qemu-${pkgver}/.libs/libcacard.so* ${pkgdir}/usr/lib/
+ cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
+ cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
+}
+md5sums=('0ff197c4ed4b695620bc4734e77c888f'
+ '33ab286a20242dda7743a900f369d68a'
+ 'f98a479ec4e656403f5f05b1914f7f1f')
Deleted: extra-i686/qemu.install
===================================================================
--- extra-i686/qemu.install 2014-09-26 06:54:23 UTC (rev 223029)
+++ extra-i686/qemu.install 2014-09-26 09:25:59 UTC (rev 223030)
@@ -1,23 +0,0 @@
-# kvm: the new package version
-post_install() {
- #
- groupadd kvm -f -g 78
-}
-
-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/extra-i686/qemu.install (from rev 223029, qemu/trunk/qemu.install)
===================================================================
--- extra-i686/qemu.install (rev 0)
+++ extra-i686/qemu.install 2014-09-26 09:25:59 UTC (rev 223030)
@@ -0,0 +1,23 @@
+# kvm: the new package version
+post_install() {
+ #
+ groupadd kvm -f -g 78
+}
+
+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
+}
Deleted: extra-x86_64/2.0.0-usb-stack.patch
===================================================================
--- extra-x86_64/2.0.0-usb-stack.patch 2014-09-26 06:54:23 UTC (rev 223029)
+++ extra-x86_64/2.0.0-usb-stack.patch 2014-09-26 09:25:59 UTC (rev 223030)
@@ -1,36 +0,0 @@
-Correct post load checks:
-1. dev->setup_len == sizeof(dev->data_buf)
- seems fine, no need to fail migration
-2. When state is DATA, passing index > len
- will cause memcpy with negative length,
- resulting in heap overflow
-
-First of the issues was reported by dgilbert.
-
-Reported-by: "Dr. David Alan Gilbert" <dgilbert <at> redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst <at> redhat.com>
----
-
-changes from v1:
-- drop state check
-- lightly tested
-
- hw/usb/bus.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/usb/bus.c b/hw/usb/bus.c
-index e48b19f..ff1dfe6 100644
---- a/hw/usb/bus.c
-+++ b/hw/usb/bus.c
- <at> <at> -51,8 +51,8 <at> <at> static int usb_device_post_load(void *opaque, int version_id)
- }
- if (dev->setup_index < 0 ||
- dev->setup_len < 0 ||
-- dev->setup_index >= sizeof(dev->data_buf) ||
-- dev->setup_len >= sizeof(dev->data_buf)) {
-+ dev->setup_index > dev->setup_len ||
-+ dev->setup_len > sizeof(dev->data_buf)) {
- return -EINVAL;
- }
- return 0;
-
Copied: qemu/repos/extra-x86_64/2.0.0-usb-stack.patch (from rev 223029, qemu/trunk/2.0.0-usb-stack.patch)
===================================================================
--- extra-x86_64/2.0.0-usb-stack.patch (rev 0)
+++ extra-x86_64/2.0.0-usb-stack.patch 2014-09-26 09:25:59 UTC (rev 223030)
@@ -0,0 +1,36 @@
+Correct post load checks:
+1. dev->setup_len == sizeof(dev->data_buf)
+ seems fine, no need to fail migration
+2. When state is DATA, passing index > len
+ will cause memcpy with negative length,
+ resulting in heap overflow
+
+First of the issues was reported by dgilbert.
+
+Reported-by: "Dr. David Alan Gilbert" <dgilbert <at> redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst <at> redhat.com>
+---
+
+changes from v1:
+- drop state check
+- lightly tested
+
+ hw/usb/bus.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/usb/bus.c b/hw/usb/bus.c
+index e48b19f..ff1dfe6 100644
+--- a/hw/usb/bus.c
++++ b/hw/usb/bus.c
+ <at> <at> -51,8 +51,8 <at> <at> static int usb_device_post_load(void *opaque, int version_id)
+ }
+ if (dev->setup_index < 0 ||
+ dev->setup_len < 0 ||
+- dev->setup_index >= sizeof(dev->data_buf) ||
+- dev->setup_len >= sizeof(dev->data_buf)) {
++ dev->setup_index > dev->setup_len ||
++ dev->setup_len > sizeof(dev->data_buf)) {
+ return -EINVAL;
+ }
+ return 0;
+
Deleted: extra-x86_64/65-kvm.rules
===================================================================
--- extra-x86_64/65-kvm.rules 2014-09-26 06:54:23 UTC (rev 223029)
+++ extra-x86_64/65-kvm.rules 2014-09-26 09:25:59 UTC (rev 223030)
@@ -1,2 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
-KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
Copied: qemu/repos/extra-x86_64/65-kvm.rules (from rev 223029, qemu/trunk/65-kvm.rules)
===================================================================
--- extra-x86_64/65-kvm.rules (rev 0)
+++ extra-x86_64/65-kvm.rules 2014-09-26 09:25:59 UTC (rev 223030)
@@ -0,0 +1,2 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-09-26 06:54:23 UTC (rev 223029)
+++ extra-x86_64/PKGBUILD 2014-09-26 09:25:59 UTC (rev 223030)
@@ -1,100 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=('qemu' 'libcacard')
-pkgver=2.1.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://wiki.qemu.org/Index.html"
-makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
- 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
- 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
- 'usbredir')
-replaces=('qemu-kvm')
-options=(!strip)
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
- 65-kvm.rules
- 2.0.0-usb-stack.patch)
-
-prepare ()
-{
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/2.0.0-usb-stack.patch"
-}
-
-build ()
-{
- cd "${srcdir}/${pkgname}-${pkgver}"
- # qemu vs. make 4 == bad
- export ARFLAGS="rv"
- # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
-
- # gtk gui breaks keymappings at the moment
- ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
- --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
- --enable-docs --libexecdir=/usr/lib/qemu \
- --disable-gtk --enable-linux-aio --enable-seccomp \
- --enable-spice --localstatedir=/var \
- --enable-tpm
- make V=99
-}
-
-package_qemu() {
- pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
- depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
- 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
- 'libiscsi' 'libcacard' 'spice' 'usbredir')
- backup=('etc/qemu/target-x86_64.conf')
- install=qemu.install
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
- # provided by seabios package
- rm "${pkgdir}/usr/share/qemu/bios.bin"
- rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml"
- rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml"
- rm "${pkgdir}/usr/share/qemu/bios-256k.bin"
- rm "${pkgdir}/usr/share/qemu/vgabios-cirrus.bin"
- rm "${pkgdir}/usr/share/qemu/vgabios-qxl.bin"
- rm "${pkgdir}/usr/share/qemu/vgabios-stdvga.bin"
- rm "${pkgdir}/usr/share/qemu/vgabios-vmware.bin"
-
- # remove conflicting /var/run directory
- rm -r "${pkgdir}/var"
- 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
- # remove libcacard files
- rm -rf ${pkgdir}/usr/include/cacard
- rm -rf ${pkgdir}/usr/lib/libcacard*
- rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc
- rm -rf ${pkgdir}/usr/bin/vscclient
-}
-
-package_libcacard() {
- pkgdesc="Common Access Card (CAC) Emulation"
- options=('strip')
- depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2' 'glib2')
- mkdir -p ${pkgdir}/usr/bin
- mkdir -p ${pkgdir}/usr/lib/pkgconfig
- mkdir -p ${pkgdir}/usr/include/cacard
- cp -a ${srcdir}/qemu-${pkgver}/libcacard/*.h ${pkgdir}/usr/include/cacard/
- cp -a ${srcdir}/qemu-${pkgver}/.libs/libcacard.so* ${pkgdir}/usr/lib/
- cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
- cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
-}
-md5sums=('78b1b51bfa2eee424e1bfdf3b66daa64'
- '33ab286a20242dda7743a900f369d68a'
- 'f98a479ec4e656403f5f05b1914f7f1f')
Copied: qemu/repos/extra-x86_64/PKGBUILD (from rev 223029, qemu/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-09-26 09:25:59 UTC (rev 223030)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=('qemu' 'libcacard')
+pkgver=2.1.2
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url="http://wiki.qemu.org/Index.html"
+makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+ 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+ 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
+ 'usbredir')
+replaces=('qemu-kvm')
+options=(!strip)
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+ 65-kvm.rules
+ 2.0.0-usb-stack.patch)
+
+prepare ()
+{
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/2.0.0-usb-stack.patch"
+}
+
+build ()
+{
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # qemu vs. make 4 == bad
+ export ARFLAGS="rv"
+ # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
+
+ # gtk gui breaks keymappings at the moment
+ ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
+ --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
+ --enable-docs --libexecdir=/usr/lib/qemu \
+ --disable-gtk --enable-linux-aio --enable-seccomp \
+ --enable-spice --localstatedir=/var \
+ --enable-tpm
+ make V=99
+}
+
+package_qemu() {
+ pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+ depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+ 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+ 'libiscsi' 'libcacard' 'spice' 'usbredir')
+ backup=('etc/qemu/target-x86_64.conf')
+ install=qemu.install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
+ # provided by seabios package
+ rm "${pkgdir}/usr/share/qemu/bios.bin"
+ rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml"
+ rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml"
+ rm "${pkgdir}/usr/share/qemu/bios-256k.bin"
+ rm "${pkgdir}/usr/share/qemu/vgabios-cirrus.bin"
+ rm "${pkgdir}/usr/share/qemu/vgabios-qxl.bin"
+ rm "${pkgdir}/usr/share/qemu/vgabios-stdvga.bin"
+ rm "${pkgdir}/usr/share/qemu/vgabios-vmware.bin"
+
+ # remove conflicting /var/run directory
+ rm -r "${pkgdir}/var"
+ 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
+ # remove libcacard files
+ rm -rf ${pkgdir}/usr/include/cacard
+ rm -rf ${pkgdir}/usr/lib/libcacard*
+ rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc
+ rm -rf ${pkgdir}/usr/bin/vscclient
+}
+
+package_libcacard() {
+ pkgdesc="Common Access Card (CAC) Emulation"
+ options=('strip')
+ depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2' 'glib2')
+ mkdir -p ${pkgdir}/usr/bin
+ mkdir -p ${pkgdir}/usr/lib/pkgconfig
+ mkdir -p ${pkgdir}/usr/include/cacard
+ cp -a ${srcdir}/qemu-${pkgver}/libcacard/*.h ${pkgdir}/usr/include/cacard/
+ cp -a ${srcdir}/qemu-${pkgver}/.libs/libcacard.so* ${pkgdir}/usr/lib/
+ cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
+ cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
+}
+md5sums=('0ff197c4ed4b695620bc4734e77c888f'
+ '33ab286a20242dda7743a900f369d68a'
+ 'f98a479ec4e656403f5f05b1914f7f1f')
Deleted: extra-x86_64/qemu.install
===================================================================
--- extra-x86_64/qemu.install 2014-09-26 06:54:23 UTC (rev 223029)
+++ extra-x86_64/qemu.install 2014-09-26 09:25:59 UTC (rev 223030)
@@ -1,23 +0,0 @@
-# kvm: the new package version
-post_install() {
- #
- groupadd kvm -f -g 78
-}
-
-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/extra-x86_64/qemu.install (from rev 223029, qemu/trunk/qemu.install)
===================================================================
--- extra-x86_64/qemu.install (rev 0)
+++ extra-x86_64/qemu.install 2014-09-26 09:25:59 UTC (rev 223030)
@@ -0,0 +1,23 @@
+# kvm: the new package version
+post_install() {
+ #
+ groupadd kvm -f -g 78
+}
+
+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
+}
More information about the arch-commits
mailing list