[arch-commits] Commit in qemu/repos (12 files)

Tobias Powalowski tpowa at nymeria.archlinux.org
Sat Jul 27 20:19:26 UTC 2013


    Date: Saturday, July 27, 2013 @ 22:19:26
  Author: tpowa
Revision: 191616

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qemu/repos/extra-i686/65-kvm.rules
    (from rev 191615, qemu/trunk/65-kvm.rules)
  qemu/repos/extra-i686/PKGBUILD
    (from rev 191615, qemu/trunk/PKGBUILD)
  qemu/repos/extra-i686/qemu.install
    (from rev 191615, qemu/trunk/qemu.install)
  qemu/repos/extra-x86_64/65-kvm.rules
    (from rev 191615, qemu/trunk/65-kvm.rules)
  qemu/repos/extra-x86_64/PKGBUILD
    (from rev 191615, qemu/trunk/PKGBUILD)
  qemu/repos/extra-x86_64/qemu.install
    (from rev 191615, qemu/trunk/qemu.install)
Deleted:
  qemu/repos/extra-i686/65-kvm.rules
  qemu/repos/extra-i686/PKGBUILD
  qemu/repos/extra-i686/qemu.install
  qemu/repos/extra-x86_64/65-kvm.rules
  qemu/repos/extra-x86_64/PKGBUILD
  qemu/repos/extra-x86_64/qemu.install

---------------------------+
 /65-kvm.rules             |    4 +
 /PKGBUILD                 |  140 ++++++++++++++++++++++++++++++++++++++++++++
 /qemu.install             |   46 ++++++++++++++
 extra-i686/65-kvm.rules   |    2 
 extra-i686/PKGBUILD       |   55 -----------------
 extra-i686/qemu.install   |   23 -------
 extra-x86_64/65-kvm.rules |    2 
 extra-x86_64/PKGBUILD     |   55 -----------------
 extra-x86_64/qemu.install |   23 -------
 9 files changed, 190 insertions(+), 160 deletions(-)

Deleted: extra-i686/65-kvm.rules
===================================================================
--- extra-i686/65-kvm.rules	2013-07-27 20:19:10 UTC (rev 191615)
+++ extra-i686/65-kvm.rules	2013-07-27 20:19:26 UTC (rev 191616)
@@ -1,2 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
-KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess"

Copied: qemu/repos/extra-i686/65-kvm.rules (from rev 191615, qemu/trunk/65-kvm.rules)
===================================================================
--- extra-i686/65-kvm.rules	                        (rev 0)
+++ extra-i686/65-kvm.rules	2013-07-27 20:19:26 UTC (rev 191616)
@@ -0,0 +1,2 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess"

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-07-27 20:19:10 UTC (rev 191615)
+++ extra-i686/PKGBUILD	2013-07-27 20:19:26 UTC (rev 191616)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=qemu
-pkgver=1.5.1
-pkgrel=2
-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-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
-         'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
-         'libiscsi')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu.install
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
-        65-kvm.rules)
-replaces=('qemu-kvm')
-options=(!strip)
-
-build ()
-{
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # 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-mixemu --libexecdir=/usr/lib/qemu \
-              --disable-gtk --enable-linux-aio --enable-seccomp
-              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=('b56e73bdcfdb214d5c68e13111aca96f'
-         '9d6de26867a05c306157e3d3c612b28a')

Copied: qemu/repos/extra-i686/PKGBUILD (from rev 191615, qemu/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-07-27 20:19:26 UTC (rev 191616)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=('qemu' 'libcacard')
+pkgver=1.5.2
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url="http://wiki.qemu.org/Index.html"
+makedepends=('texi2html' 'perl' 'python2')
+install=qemu.install
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+        65-kvm.rules)
+replaces=('qemu-kvm')
+options=(!strip)
+
+build ()
+{
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # 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 --enable-mixemu --libexecdir=/usr/lib/qemu \
+              --disable-gtk --enable-linux-aio --enable-seccomp
+              make
+}
+
+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')
+  backup=('etc/qemu/target-x86_64.conf')
+  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
+  # remove libcacard files
+  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' '!libtool')
+ depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2')
+ mkdir -p ${pkgdir}/usr/bin
+ mkdir -p ${pkgdir}/usr/lib/pkgconfig
+ 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=('04b94189ba587b3280713ded3b7f959a'
+         '9d6de26867a05c306157e3d3c612b28a')

Deleted: extra-i686/qemu.install
===================================================================
--- extra-i686/qemu.install	2013-07-27 20:19:10 UTC (rev 191615)
+++ extra-i686/qemu.install	2013-07-27 20:19:26 UTC (rev 191616)
@@ -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 191615, qemu/trunk/qemu.install)
===================================================================
--- extra-i686/qemu.install	                        (rev 0)
+++ extra-i686/qemu.install	2013-07-27 20:19:26 UTC (rev 191616)
@@ -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/65-kvm.rules
===================================================================
--- extra-x86_64/65-kvm.rules	2013-07-27 20:19:10 UTC (rev 191615)
+++ extra-x86_64/65-kvm.rules	2013-07-27 20:19:26 UTC (rev 191616)
@@ -1,2 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
-KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess"

Copied: qemu/repos/extra-x86_64/65-kvm.rules (from rev 191615, qemu/trunk/65-kvm.rules)
===================================================================
--- extra-x86_64/65-kvm.rules	                        (rev 0)
+++ extra-x86_64/65-kvm.rules	2013-07-27 20:19:26 UTC (rev 191616)
@@ -0,0 +1,2 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess"

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-07-27 20:19:10 UTC (rev 191615)
+++ extra-x86_64/PKGBUILD	2013-07-27 20:19:26 UTC (rev 191616)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=qemu
-pkgver=1.5.1
-pkgrel=2
-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-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
-         'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
-         'libiscsi')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu.install
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
-        65-kvm.rules)
-replaces=('qemu-kvm')
-options=(!strip)
-
-build ()
-{
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # 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-mixemu --libexecdir=/usr/lib/qemu \
-              --disable-gtk --enable-linux-aio --enable-seccomp
-              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=('b56e73bdcfdb214d5c68e13111aca96f'
-         '9d6de26867a05c306157e3d3c612b28a')

Copied: qemu/repos/extra-x86_64/PKGBUILD (from rev 191615, qemu/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-07-27 20:19:26 UTC (rev 191616)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=('qemu' 'libcacard')
+pkgver=1.5.2
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url="http://wiki.qemu.org/Index.html"
+makedepends=('texi2html' 'perl' 'python2')
+install=qemu.install
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+        65-kvm.rules)
+replaces=('qemu-kvm')
+options=(!strip)
+
+build ()
+{
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # 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 --enable-mixemu --libexecdir=/usr/lib/qemu \
+              --disable-gtk --enable-linux-aio --enable-seccomp
+              make
+}
+
+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')
+  backup=('etc/qemu/target-x86_64.conf')
+  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
+  # remove libcacard files
+  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' '!libtool')
+ depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2')
+ mkdir -p ${pkgdir}/usr/bin
+ mkdir -p ${pkgdir}/usr/lib/pkgconfig
+ 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=('04b94189ba587b3280713ded3b7f959a'
+         '9d6de26867a05c306157e3d3c612b28a')

Deleted: extra-x86_64/qemu.install
===================================================================
--- extra-x86_64/qemu.install	2013-07-27 20:19:10 UTC (rev 191615)
+++ extra-x86_64/qemu.install	2013-07-27 20:19:26 UTC (rev 191616)
@@ -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 191615, qemu/trunk/qemu.install)
===================================================================
--- extra-x86_64/qemu.install	                        (rev 0)
+++ extra-x86_64/qemu.install	2013-07-27 20:19:26 UTC (rev 191616)
@@ -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