Date: Thursday, August 20, 2015 @ 11:51:39
Author: seblu
Revision: 244413
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qemu/repos/extra-i686/65-kvm.rules
(from rev 244412, qemu/trunk/65-kvm.rules)
qemu/repos/extra-i686/PKGBUILD
(from rev 244412, qemu/trunk/PKGBUILD)
qemu/repos/extra-i686/qemu-ga.service
(from rev 244412, qemu/trunk/qemu-ga.service)
qemu/repos/extra-i686/qemu.install
(from rev 244412, qemu/trunk/qemu.install)
qemu/repos/extra-i686/qemu.sysusers
(from rev 244412, qemu/trunk/qemu.sysusers)
qemu/repos/extra-x86_64/65-kvm.rules
(from rev 244412, qemu/trunk/65-kvm.rules)
qemu/repos/extra-x86_64/PKGBUILD
(from rev 244412, qemu/trunk/PKGBUILD)
qemu/repos/extra-x86_64/qemu-ga.service
(from rev 244412, qemu/trunk/qemu-ga.service)
qemu/repos/extra-x86_64/qemu.install
(from rev 244412, qemu/trunk/qemu.install)
qemu/repos/extra-x86_64/qemu.sysusers
(from rev 244412, qemu/trunk/qemu.sysusers)
Deleted:
qemu/repos/extra-i686/65-kvm.rules
qemu/repos/extra-i686/PKGBUILD
qemu/repos/extra-i686/qemu-ga.service
qemu/repos/extra-i686/qemu.install
qemu/repos/extra-i686/qemu.sysusers
qemu/repos/extra-x86_64/65-kvm.rules
qemu/repos/extra-x86_64/PKGBUILD
qemu/repos/extra-x86_64/qemu-ga.service
qemu/repos/extra-x86_64/qemu.install
qemu/repos/extra-x86_64/qemu.sysusers
------------------------------+
/65-kvm.rules | 4
/PKGBUILD | 380 +++++++++++++++++++++++++++++++++++++++++
/qemu-ga.service | 16 +
/qemu.install | 50 +++++
/qemu.sysusers | 2
extra-i686/65-kvm.rules | 2
extra-i686/PKGBUILD | 160 -----------------
extra-i686/qemu-ga.service | 8
extra-i686/qemu.install | 25 --
extra-i686/qemu.sysusers | 1
extra-x86_64/65-kvm.rules | 2
extra-x86_64/PKGBUILD | 160 -----------------
extra-x86_64/qemu-ga.service | 8
extra-x86_64/qemu.install | 25 --
extra-x86_64/qemu.sysusers | 1
15 files changed, 452 insertions(+), 392 deletions(-)
Deleted: extra-i686/65-kvm.rules
===================================================================
--- extra-i686/65-kvm.rules 2015-08-20 09:51:23 UTC (rev 244412)
+++ extra-i686/65-kvm.rules 2015-08-20 09:51:39 UTC (rev 244413)
@@ -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 244412,
qemu/trunk/65-kvm.rules)
===================================================================
--- extra-i686/65-kvm.rules (rev 0)
+++ extra-i686/65-kvm.rules 2015-08-20 09:51:39 UTC (rev 244413)
@@ -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 2015-08-20 09:51:23 UTC (rev 244412)
+++ extra-i686/PKGBUILD 2015-08-20 09:51:39 UTC (rev 244413)
@@ -1,160 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tp...@archlinux.org>
-# Contributor: Sébastien "Seblu" Luttringer <se...@seblu.net>
-
-pkgbase=qemu
-pkgname=('qemu'
- 'qemu-block-iscsi'
- 'qemu-block-rbd'
- 'qemu-block-gluster'
- 'qemu-guest-agent'
- 'libcacard')
-pkgver=2.4.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url='http://wiki.qemu.org/'
-makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
- 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
- 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
- 'usbredir' 'ceph' 'glusterfs' 'libssh2' 'lzo' 'snappy')
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
- qemu.sysusers
- qemu-ga.service
- 65-kvm.rules)
-md5sums=('186ee8194140a484a455f8e3c74589f4'
- '49778d11c28af170c4bebcc648b0ace1'
- '44ee242d758f9318c6a1ea1dae96aa3a'
- '33ab286a20242dda7743a900f369d68a')
-
-prepare() {
- for _p in *.patch; do
- [[ -e "$_p" ]] || continue
- msg2 "Patching $_p"
- patch -p1 -d ${pkgname}-${pkgver} < "$_p"
- done
-}
-
-build ()
-{
- cd ${pkgname}-${pkgver}
- # qemu vs. make 4 == bad
- export ARFLAGS="rv"
- # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
- export CFLAGS+=' -fPIC'
- # 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 \
- --enable-modules --enable-{rbd,glusterfs,libiscsi,curl}
- make V=99
-}
-
-package_qemu() {
- pkgdesc='A generic and open source processor emulator which achieves a good
emulation speed by using dynamic translation'
- depends=('glibc' 'pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'libsasl' 'libgl'
- 'seabios' 'libcap' 'libcap-ng' 'libaio' 'libseccomp' 'libcacard'
- 'spice' 'usbredir' 'lzo' 'snappy' 'gcc-libs' 'zlib' 'bzip2' 'nspr'
- 'ncurses' 'libx11' 'libusb' 'libpulse' 'libssh2' 'curl')
- backup=('etc/qemu/target-x86_64.conf')
- replaces=('qemu-kvm')
- optdepends=('samba: SMB/CIFS server support'
- 'qemu-block-iscsi: iSCSI block support'
- 'qemu-block-rbd: RBD block support'
- 'qemu-block-gluster: glusterfs block support')
- options=(!strip)
- install=qemu.install
-
- make -C ${pkgname}-${pkgver} DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu"
install
-
- cd "${pkgdir}"
-
- # provided by seabios package
- rm usr/share/qemu/bios.bin
- rm usr/share/qemu/acpi-dsdt.aml
- rm usr/share/qemu/q35-acpi-dsdt.aml
- rm usr/share/qemu/bios-256k.bin
- rm usr/share/qemu/vgabios-cirrus.bin
- rm usr/share/qemu/vgabios-qxl.bin
- rm usr/share/qemu/vgabios-stdvga.bin
- rm usr/share/qemu/vgabios-vmware.bin
-
- # remove conflicting /var/run directory
- rm -r var
-
- # systemd stuff
- install -D -m644 "${srcdir}/65-kvm.rules" usr/lib/udev/rules.d/65-kvm.rules
- install -D -m644 "${srcdir}/qemu.sysusers" usr/lib/sysusers.d/qemu.conf
-
- # bridge_helper needs suid
- # https://bugs.archlinux.org/task/32565
- chmod u+s usr/lib/qemu/qemu-bridge-helper
-
- # manual striping in scripts directory
- find 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 -r usr/include/cacard
- rm usr/lib/libcacard*
- rm usr/lib/pkgconfig/libcacard.pc
- rm usr/bin/vscclient
-
- # remove splitted block modules
- rm usr/lib/qemu/block-{iscsi,rbd,gluster}.so
-
- # remove guest agent
- rm usr/bin/qemu-ga
-}
-
-package_libcacard() {
- pkgdesc='Common Access Card (CAC) Emulation'
- depends=('glibc' 'nss' 'nspr' 'glib2')
-
- cd "${pkgdir}"
- install -d usr/{bin,lib/pkgconfig,include/cacard}
- cp -a "${srcdir}"/qemu-${pkgver}/libcacard/*.h usr/include/cacard/
- cp -a "${srcdir}"/qemu-${pkgver}/libcacard.pc usr/lib/pkgconfig/
- cp -a "${srcdir}"/qemu-${pkgver}/.libs/vscclient usr/bin/
- cp -a "${srcdir}"/qemu-${pkgver}/.libs/libcacard.so* usr/lib/
-}
-
-package_qemu-block-iscsi() {
- pkgdesc='QEMU iSCSI block module'
- depends=('glibc' 'glib2' 'libiscsi')
-
- install -D qemu-${pkgver}/block-iscsi.so
"${pkgdir}"/usr/lib/qemu/block-iscsi.so
-}
-
-package_qemu-block-rbd() {
- pkgdesc='QEMU RBD block module'
- depends=('glibc' 'glib2' 'ceph')
-
- install -D qemu-${pkgver}/block-rbd.so "${pkgdir}"/usr/lib/qemu/block-rbd.so
-}
-
-package_qemu-block-gluster() {
- pkgdesc='QEMU GlusterFS block module'
- depends=('glibc' 'glib2' 'glusterfs')
-
- install -D qemu-${pkgver}/block-gluster.so
"${pkgdir}"/usr/lib/qemu/block-gluster.so
-}
-
-package_qemu-guest-agent() {
- pkgdesc='QEMU Guest Agent'
- depends=('glibc' 'gcc-libs' 'glib2')
-
- install -D qemu-${pkgver}/qemu-ga "${pkgdir}"/usr/bin/qemu-ga
- install -D qemu-ga.service "${pkgdir}"/usr/lib/systemd/system/qemu-ga.service
-}
-
-# vim:set ts=2 sw=2 et:
Copied: qemu/repos/extra-i686/PKGBUILD (from rev 244412, qemu/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-08-20 09:51:39 UTC (rev 244413)
@@ -0,0 +1,190 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tp...@archlinux.org>
+# Contributor: Sébastien "Seblu" Luttringer <se...@seblu.net>
+
+pkgbase=qemu
+pkgname=('qemu'
+ 'qemu-arch-extra'
+ 'qemu-block-iscsi'
+ 'qemu-block-rbd'
+ 'qemu-block-gluster'
+ 'qemu-guest-agent'
+ 'libcacard')
+pkgver=2.4.0
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url='http://wiki.qemu.org/'
+makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+ 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+ 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
+ 'usbredir' 'ceph' 'glusterfs' 'libssh2' 'lzo' 'snappy')
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+ qemu.sysusers
+ qemu-ga.service
+ 65-kvm.rules)
+md5sums=('186ee8194140a484a455f8e3c74589f4'
+ '49778d11c28af170c4bebcc648b0ace1'
+ '44ee242d758f9318c6a1ea1dae96aa3a'
+ '33ab286a20242dda7743a900f369d68a')
+
+_extra_arches=(aarch64 alpha arm armeb cris lm32 m68k microblaze microblazeel
mips
+mips64 mips64el mipsel mipsn32 mipsn32el or32 ppc ppc64 ppc64abi32 ppc64le
s390x
+sh4 sh4eb sparc sparc32plus sparc64 moxie ppcemb tricore unicore32 xtensa
xtensaeb)
+_extra_blob=(QEMU,cgthree.bin QEMU,tcx.bin bamboo.dtb openbios-ppc
+openbios-sparc32 openbios-sparc64 palcode-clipper petalogix-ml605.dtb
+petalogix-s3adsp1800.dtb ppc_rom.bin s390-ccw.img s390-zipl.rom slof.bin
+spapr-rtas.bin u-boot.e500)
+
+prepare() {
+ for _p in *.patch; do
+ [[ -e "$_p" ]] || continue
+ msg2 "Patching $_p"
+ patch -p1 -d ${pkgname}-${pkgver} < "$_p"
+ done
+}
+
+build ()
+{
+ cd ${pkgname}-${pkgver}
+ # qemu vs. make 4 == bad
+ export ARFLAGS="rv"
+ # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
+ export CFLAGS+=' -fPIC'
+ # 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 \
+ --enable-modules --enable-{rbd,glusterfs,libiscsi,curl}
+ make V=99
+}
+
+package_qemu() {
+ pkgdesc='A generic and open source processor emulator which achieves a good
emulation speed by using dynamic translation'
+ depends=('glibc' 'pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'libsasl' 'libgl'
+ 'seabios' 'libcap' 'libcap-ng' 'libaio' 'libseccomp' 'libcacard'
+ 'spice' 'usbredir' 'lzo' 'snappy' 'gcc-libs' 'zlib' 'bzip2' 'nspr'
+ 'ncurses' 'libx11' 'libusb' 'libpulse' 'libssh2' 'curl')
+ replaces=('qemu-kvm')
+ optdepends=('samba: SMB/CIFS server support'
+ 'qemu-arch-extra: extra architectures support'
+ 'qemu-block-iscsi: iSCSI block support'
+ 'qemu-block-rbd: RBD block support'
+ 'qemu-block-gluster: glusterfs block support')
+ options=(!strip)
+ install=qemu.install
+
+ make -C ${pkgname}-${pkgver} DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu"
install
+
+ cd "${pkgdir}"
+
+ # provided by seabios package
+ rm usr/share/qemu/bios.bin
+ rm usr/share/qemu/acpi-dsdt.aml
+ rm usr/share/qemu/q35-acpi-dsdt.aml
+ rm usr/share/qemu/bios-256k.bin
+ rm usr/share/qemu/vgabios-cirrus.bin
+ rm usr/share/qemu/vgabios-qxl.bin
+ rm usr/share/qemu/vgabios-stdvga.bin
+ rm usr/share/qemu/vgabios-vmware.bin
+
+ # remove conflicting /var/run directory
+ rm -r var
+
+ # systemd stuff
+ install -D -m644 "${srcdir}/65-kvm.rules" usr/lib/udev/rules.d/65-kvm.rules
+ install -D -m644 "${srcdir}/qemu.sysusers" usr/lib/sysusers.d/qemu.conf
+
+ # bridge_helper needs suid
+ # https://bugs.archlinux.org/task/32565
+ chmod u+s usr/lib/qemu/qemu-bridge-helper
+
+ # remove libcacard files
+ rm -r usr/include/cacard
+ rm usr/lib/libcacard*
+ rm usr/lib/pkgconfig/libcacard.pc
+ rm usr/bin/vscclient
+
+ # remove splitted block modules
+ rm usr/lib/qemu/block-{iscsi,rbd,gluster}.so
+
+ # remove guest agent
+ rm usr/bin/qemu-ga
+
+ # remove extra arch
+ for _arch in "${_extra_arches[@]}"; do
+ rm -f usr/bin/qemu-${_arch} usr/bin/qemu-system-${_arch}
+ done
+ for _blob in "${_extra_blob[@]}"; do
+ rm usr/share/qemu/${_blob}
+ done
+}
+
+package_qemu-arch-extra() {
+ pkgdesc='QEMU with full support for non x86 architectures'
+ depends=('glibc' 'gcc-libs' 'glib2' 'qemu')
+ options=(!strip)
+
+ cd qemu-${pkgver}
+ install -dm755 "${pkgdir}"/usr/bin
+ for _arch in "${_extra_arches[@]}"; do
+ install -m755 ${_arch}-*/qemu-*${_arch} "${pkgdir}"/usr/bin
+ done
+
+ cd pc-bios
+ for _blob in "${_extra_blob[@]}"; do
+ install -Dm644 ${_blob} "${pkgdir}"/usr/share/qemu/${_blob}
+ done
+
+ # manually stripping
+ find "${pkgdir}"/usr/bin -type f -exec strip {} \;
+}
+
+package_qemu-block-iscsi() {
+ pkgdesc='QEMU iSCSI block module'
+ depends=('glibc' 'glib2' 'libiscsi')
+
+ install -D qemu-${pkgver}/block-iscsi.so
"${pkgdir}"/usr/lib/qemu/block-iscsi.so
+}
+
+package_qemu-block-rbd() {
+ pkgdesc='QEMU RBD block module'
+ depends=('glibc' 'glib2' 'ceph')
+
+ install -D qemu-${pkgver}/block-rbd.so "${pkgdir}"/usr/lib/qemu/block-rbd.so
+}
+
+package_qemu-block-gluster() {
+ pkgdesc='QEMU GlusterFS block module'
+ depends=('glibc' 'glib2' 'glusterfs')
+
+ install -D qemu-${pkgver}/block-gluster.so
"${pkgdir}"/usr/lib/qemu/block-gluster.so
+}
+
+package_qemu-guest-agent() {
+ pkgdesc='QEMU Guest Agent'
+ depends=('glibc' 'gcc-libs' 'glib2')
+
+ install -D qemu-${pkgver}/qemu-ga "${pkgdir}"/usr/bin/qemu-ga
+ install -D qemu-ga.service "${pkgdir}"/usr/lib/systemd/system/qemu-ga.service
+}
+
+package_libcacard() {
+ pkgdesc='Common Access Card (CAC) Emulation'
+ depends=('glibc' 'nss' 'nspr' 'glib2')
+
+ cd "${pkgdir}"
+ install -d usr/{bin,lib/pkgconfig,include/cacard}
+ cp -a "${srcdir}"/qemu-${pkgver}/libcacard/*.h usr/include/cacard/
+ cp -a "${srcdir}"/qemu-${pkgver}/libcacard.pc usr/lib/pkgconfig/
+ cp -a "${srcdir}"/qemu-${pkgver}/.libs/vscclient usr/bin/
+ cp -a "${srcdir}"/qemu-${pkgver}/.libs/libcacard.so* usr/lib/
+}
+
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/qemu-ga.service
===================================================================
--- extra-i686/qemu-ga.service 2015-08-20 09:51:23 UTC (rev 244412)
+++ extra-i686/qemu-ga.service 2015-08-20 09:51:39 UTC (rev 244413)
@@ -1,8 +0,0 @@
-[Unit]
-Description=QEMU Guest Agent
-
-[Service]
-ExecStart=/usr/bin/qemu-ga
-
-[Install]
-WantedBy=multi-user.target
Copied: qemu/repos/extra-i686/qemu-ga.service (from rev 244412,
qemu/trunk/qemu-ga.service)
===================================================================
--- extra-i686/qemu-ga.service (rev 0)
+++ extra-i686/qemu-ga.service 2015-08-20 09:51:39 UTC (rev 244413)
@@ -0,0 +1,8 @@
+[Unit]
+Description=QEMU Guest Agent
+
+[Service]
+ExecStart=/usr/bin/qemu-ga
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-i686/qemu.install
===================================================================
--- extra-i686/qemu.install 2015-08-20 09:51:23 UTC (rev 244412)
+++ extra-i686/qemu.install 2015-08-20 09:51:39 UTC (rev 244413)
@@ -1,25 +0,0 @@
-# Arg 1: the new package version
-post_install() {
- # create kvm group
- systemd-sysusers qemu.conf
-
- # trigger events on modules files when already loaded
- for _f in /sys/devices/virtual/misc/{kvm,vhost-net}; do
- [[ -e "$_f" ]] && udevadm trigger "$_f"
- done
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- if (( "$(vercmp $2 0.11)" < 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)" < 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
-}
Copied: qemu/repos/extra-i686/qemu.install (from rev 244412,
qemu/trunk/qemu.install)
===================================================================
--- extra-i686/qemu.install (rev 0)
+++ extra-i686/qemu.install 2015-08-20 09:51:39 UTC (rev 244413)
@@ -0,0 +1,25 @@
+# Arg 1: the new package version
+post_install() {
+ # create kvm group
+ systemd-sysusers qemu.conf
+
+ # trigger events on modules files when already loaded
+ for _f in /sys/devices/virtual/misc/{kvm,vhost-net}; do
+ [[ -e "$_f" ]] && udevadm trigger "$_f"
+ done
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if (( "$(vercmp $2 0.11)" < 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)" < 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
+}
Deleted: extra-i686/qemu.sysusers
===================================================================
--- extra-i686/qemu.sysusers 2015-08-20 09:51:23 UTC (rev 244412)
+++ extra-i686/qemu.sysusers 2015-08-20 09:51:39 UTC (rev 244413)
@@ -1 +0,0 @@
-g kvm 78 -
Copied: qemu/repos/extra-i686/qemu.sysusers (from rev 244412,
qemu/trunk/qemu.sysusers)
===================================================================
--- extra-i686/qemu.sysusers (rev 0)
+++ extra-i686/qemu.sysusers 2015-08-20 09:51:39 UTC (rev 244413)
@@ -0,0 +1 @@
+g kvm 78 -
Deleted: extra-x86_64/65-kvm.rules
===================================================================
--- extra-x86_64/65-kvm.rules 2015-08-20 09:51:23 UTC (rev 244412)
+++ extra-x86_64/65-kvm.rules 2015-08-20 09:51:39 UTC (rev 244413)
@@ -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 244412,
qemu/trunk/65-kvm.rules)
===================================================================
--- extra-x86_64/65-kvm.rules (rev 0)
+++ extra-x86_64/65-kvm.rules 2015-08-20 09:51:39 UTC (rev 244413)
@@ -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 2015-08-20 09:51:23 UTC (rev 244412)
+++ extra-x86_64/PKGBUILD 2015-08-20 09:51:39 UTC (rev 244413)
@@ -1,160 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tp...@archlinux.org>
-# Contributor: Sébastien "Seblu" Luttringer <se...@seblu.net>
-
-pkgbase=qemu
-pkgname=('qemu'
- 'qemu-block-iscsi'
- 'qemu-block-rbd'
- 'qemu-block-gluster'
- 'qemu-guest-agent'
- 'libcacard')
-pkgver=2.4.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url='http://wiki.qemu.org/'
-makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
- 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
- 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
- 'usbredir' 'ceph' 'glusterfs' 'libssh2' 'lzo' 'snappy')
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
- qemu.sysusers
- qemu-ga.service
- 65-kvm.rules)
-md5sums=('186ee8194140a484a455f8e3c74589f4'
- '49778d11c28af170c4bebcc648b0ace1'
- '44ee242d758f9318c6a1ea1dae96aa3a'
- '33ab286a20242dda7743a900f369d68a')
-
-prepare() {
- for _p in *.patch; do
- [[ -e "$_p" ]] || continue
- msg2 "Patching $_p"
- patch -p1 -d ${pkgname}-${pkgver} < "$_p"
- done
-}
-
-build ()
-{
- cd ${pkgname}-${pkgver}
- # qemu vs. make 4 == bad
- export ARFLAGS="rv"
- # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
- export CFLAGS+=' -fPIC'
- # 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 \
- --enable-modules --enable-{rbd,glusterfs,libiscsi,curl}
- make V=99
-}
-
-package_qemu() {
- pkgdesc='A generic and open source processor emulator which achieves a good
emulation speed by using dynamic translation'
- depends=('glibc' 'pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'libsasl' 'libgl'
- 'seabios' 'libcap' 'libcap-ng' 'libaio' 'libseccomp' 'libcacard'
- 'spice' 'usbredir' 'lzo' 'snappy' 'gcc-libs' 'zlib' 'bzip2' 'nspr'
- 'ncurses' 'libx11' 'libusb' 'libpulse' 'libssh2' 'curl')
- backup=('etc/qemu/target-x86_64.conf')
- replaces=('qemu-kvm')
- optdepends=('samba: SMB/CIFS server support'
- 'qemu-block-iscsi: iSCSI block support'
- 'qemu-block-rbd: RBD block support'
- 'qemu-block-gluster: glusterfs block support')
- options=(!strip)
- install=qemu.install
-
- make -C ${pkgname}-${pkgver} DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu"
install
-
- cd "${pkgdir}"
-
- # provided by seabios package
- rm usr/share/qemu/bios.bin
- rm usr/share/qemu/acpi-dsdt.aml
- rm usr/share/qemu/q35-acpi-dsdt.aml
- rm usr/share/qemu/bios-256k.bin
- rm usr/share/qemu/vgabios-cirrus.bin
- rm usr/share/qemu/vgabios-qxl.bin
- rm usr/share/qemu/vgabios-stdvga.bin
- rm usr/share/qemu/vgabios-vmware.bin
-
- # remove conflicting /var/run directory
- rm -r var
-
- # systemd stuff
- install -D -m644 "${srcdir}/65-kvm.rules" usr/lib/udev/rules.d/65-kvm.rules
- install -D -m644 "${srcdir}/qemu.sysusers" usr/lib/sysusers.d/qemu.conf
-
- # bridge_helper needs suid
- # https://bugs.archlinux.org/task/32565
- chmod u+s usr/lib/qemu/qemu-bridge-helper
-
- # manual striping in scripts directory
- find 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 -r usr/include/cacard
- rm usr/lib/libcacard*
- rm usr/lib/pkgconfig/libcacard.pc
- rm usr/bin/vscclient
-
- # remove splitted block modules
- rm usr/lib/qemu/block-{iscsi,rbd,gluster}.so
-
- # remove guest agent
- rm usr/bin/qemu-ga
-}
-
-package_libcacard() {
- pkgdesc='Common Access Card (CAC) Emulation'
- depends=('glibc' 'nss' 'nspr' 'glib2')
-
- cd "${pkgdir}"
- install -d usr/{bin,lib/pkgconfig,include/cacard}
- cp -a "${srcdir}"/qemu-${pkgver}/libcacard/*.h usr/include/cacard/
- cp -a "${srcdir}"/qemu-${pkgver}/libcacard.pc usr/lib/pkgconfig/
- cp -a "${srcdir}"/qemu-${pkgver}/.libs/vscclient usr/bin/
- cp -a "${srcdir}"/qemu-${pkgver}/.libs/libcacard.so* usr/lib/
-}
-
-package_qemu-block-iscsi() {
- pkgdesc='QEMU iSCSI block module'
- depends=('glibc' 'glib2' 'libiscsi')
-
- install -D qemu-${pkgver}/block-iscsi.so
"${pkgdir}"/usr/lib/qemu/block-iscsi.so
-}
-
-package_qemu-block-rbd() {
- pkgdesc='QEMU RBD block module'
- depends=('glibc' 'glib2' 'ceph')
-
- install -D qemu-${pkgver}/block-rbd.so "${pkgdir}"/usr/lib/qemu/block-rbd.so
-}
-
-package_qemu-block-gluster() {
- pkgdesc='QEMU GlusterFS block module'
- depends=('glibc' 'glib2' 'glusterfs')
-
- install -D qemu-${pkgver}/block-gluster.so
"${pkgdir}"/usr/lib/qemu/block-gluster.so
-}
-
-package_qemu-guest-agent() {
- pkgdesc='QEMU Guest Agent'
- depends=('glibc' 'gcc-libs' 'glib2')
-
- install -D qemu-${pkgver}/qemu-ga "${pkgdir}"/usr/bin/qemu-ga
- install -D qemu-ga.service "${pkgdir}"/usr/lib/systemd/system/qemu-ga.service
-}
-
-# vim:set ts=2 sw=2 et:
Copied: qemu/repos/extra-x86_64/PKGBUILD (from rev 244412, qemu/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-08-20 09:51:39 UTC (rev 244413)
@@ -0,0 +1,190 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tp...@archlinux.org>
+# Contributor: Sébastien "Seblu" Luttringer <se...@seblu.net>
+
+pkgbase=qemu
+pkgname=('qemu'
+ 'qemu-arch-extra'
+ 'qemu-block-iscsi'
+ 'qemu-block-rbd'
+ 'qemu-block-gluster'
+ 'qemu-guest-agent'
+ 'libcacard')
+pkgver=2.4.0
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url='http://wiki.qemu.org/'
+makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+ 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+ 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
+ 'usbredir' 'ceph' 'glusterfs' 'libssh2' 'lzo' 'snappy')
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+ qemu.sysusers
+ qemu-ga.service
+ 65-kvm.rules)
+md5sums=('186ee8194140a484a455f8e3c74589f4'
+ '49778d11c28af170c4bebcc648b0ace1'
+ '44ee242d758f9318c6a1ea1dae96aa3a'
+ '33ab286a20242dda7743a900f369d68a')
+
+_extra_arches=(aarch64 alpha arm armeb cris lm32 m68k microblaze microblazeel
mips
+mips64 mips64el mipsel mipsn32 mipsn32el or32 ppc ppc64 ppc64abi32 ppc64le
s390x
+sh4 sh4eb sparc sparc32plus sparc64 moxie ppcemb tricore unicore32 xtensa
xtensaeb)
+_extra_blob=(QEMU,cgthree.bin QEMU,tcx.bin bamboo.dtb openbios-ppc
+openbios-sparc32 openbios-sparc64 palcode-clipper petalogix-ml605.dtb
+petalogix-s3adsp1800.dtb ppc_rom.bin s390-ccw.img s390-zipl.rom slof.bin
+spapr-rtas.bin u-boot.e500)
+
+prepare() {
+ for _p in *.patch; do
+ [[ -e "$_p" ]] || continue
+ msg2 "Patching $_p"
+ patch -p1 -d ${pkgname}-${pkgver} < "$_p"
+ done
+}
+
+build ()
+{
+ cd ${pkgname}-${pkgver}
+ # qemu vs. make 4 == bad
+ export ARFLAGS="rv"
+ # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
+ export CFLAGS+=' -fPIC'
+ # 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 \
+ --enable-modules --enable-{rbd,glusterfs,libiscsi,curl}
+ make V=99
+}
+
+package_qemu() {
+ pkgdesc='A generic and open source processor emulator which achieves a good
emulation speed by using dynamic translation'
+ depends=('glibc' 'pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'libsasl' 'libgl'
+ 'seabios' 'libcap' 'libcap-ng' 'libaio' 'libseccomp' 'libcacard'
+ 'spice' 'usbredir' 'lzo' 'snappy' 'gcc-libs' 'zlib' 'bzip2' 'nspr'
+ 'ncurses' 'libx11' 'libusb' 'libpulse' 'libssh2' 'curl')
+ replaces=('qemu-kvm')
+ optdepends=('samba: SMB/CIFS server support'
+ 'qemu-arch-extra: extra architectures support'
+ 'qemu-block-iscsi: iSCSI block support'
+ 'qemu-block-rbd: RBD block support'
+ 'qemu-block-gluster: glusterfs block support')
+ options=(!strip)
+ install=qemu.install
+
+ make -C ${pkgname}-${pkgver} DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu"
install
+
+ cd "${pkgdir}"
+
+ # provided by seabios package
+ rm usr/share/qemu/bios.bin
+ rm usr/share/qemu/acpi-dsdt.aml
+ rm usr/share/qemu/q35-acpi-dsdt.aml
+ rm usr/share/qemu/bios-256k.bin
+ rm usr/share/qemu/vgabios-cirrus.bin
+ rm usr/share/qemu/vgabios-qxl.bin
+ rm usr/share/qemu/vgabios-stdvga.bin
+ rm usr/share/qemu/vgabios-vmware.bin
+
+ # remove conflicting /var/run directory
+ rm -r var
+
+ # systemd stuff
+ install -D -m644 "${srcdir}/65-kvm.rules" usr/lib/udev/rules.d/65-kvm.rules
+ install -D -m644 "${srcdir}/qemu.sysusers" usr/lib/sysusers.d/qemu.conf
+
+ # bridge_helper needs suid
+ # https://bugs.archlinux.org/task/32565
+ chmod u+s usr/lib/qemu/qemu-bridge-helper
+
+ # remove libcacard files
+ rm -r usr/include/cacard
+ rm usr/lib/libcacard*
+ rm usr/lib/pkgconfig/libcacard.pc
+ rm usr/bin/vscclient
+
+ # remove splitted block modules
+ rm usr/lib/qemu/block-{iscsi,rbd,gluster}.so
+
+ # remove guest agent
+ rm usr/bin/qemu-ga
+
+ # remove extra arch
+ for _arch in "${_extra_arches[@]}"; do
+ rm -f usr/bin/qemu-${_arch} usr/bin/qemu-system-${_arch}
+ done
+ for _blob in "${_extra_blob[@]}"; do
+ rm usr/share/qemu/${_blob}
+ done
+}
+
+package_qemu-arch-extra() {
+ pkgdesc='QEMU with full support for non x86 architectures'
+ depends=('glibc' 'gcc-libs' 'glib2' 'qemu')
+ options=(!strip)
+
+ cd qemu-${pkgver}
+ install -dm755 "${pkgdir}"/usr/bin
+ for _arch in "${_extra_arches[@]}"; do
+ install -m755 ${_arch}-*/qemu-*${_arch} "${pkgdir}"/usr/bin
+ done
+
+ cd pc-bios
+ for _blob in "${_extra_blob[@]}"; do
+ install -Dm644 ${_blob} "${pkgdir}"/usr/share/qemu/${_blob}
+ done
+
+ # manually stripping
+ find "${pkgdir}"/usr/bin -type f -exec strip {} \;
+}
+
+package_qemu-block-iscsi() {
+ pkgdesc='QEMU iSCSI block module'
+ depends=('glibc' 'glib2' 'libiscsi')
+
+ install -D qemu-${pkgver}/block-iscsi.so
"${pkgdir}"/usr/lib/qemu/block-iscsi.so
+}
+
+package_qemu-block-rbd() {
+ pkgdesc='QEMU RBD block module'
+ depends=('glibc' 'glib2' 'ceph')
+
+ install -D qemu-${pkgver}/block-rbd.so "${pkgdir}"/usr/lib/qemu/block-rbd.so
+}
+
+package_qemu-block-gluster() {
+ pkgdesc='QEMU GlusterFS block module'
+ depends=('glibc' 'glib2' 'glusterfs')
+
+ install -D qemu-${pkgver}/block-gluster.so
"${pkgdir}"/usr/lib/qemu/block-gluster.so
+}
+
+package_qemu-guest-agent() {
+ pkgdesc='QEMU Guest Agent'
+ depends=('glibc' 'gcc-libs' 'glib2')
+
+ install -D qemu-${pkgver}/qemu-ga "${pkgdir}"/usr/bin/qemu-ga
+ install -D qemu-ga.service "${pkgdir}"/usr/lib/systemd/system/qemu-ga.service
+}
+
+package_libcacard() {
+ pkgdesc='Common Access Card (CAC) Emulation'
+ depends=('glibc' 'nss' 'nspr' 'glib2')
+
+ cd "${pkgdir}"
+ install -d usr/{bin,lib/pkgconfig,include/cacard}
+ cp -a "${srcdir}"/qemu-${pkgver}/libcacard/*.h usr/include/cacard/
+ cp -a "${srcdir}"/qemu-${pkgver}/libcacard.pc usr/lib/pkgconfig/
+ cp -a "${srcdir}"/qemu-${pkgver}/.libs/vscclient usr/bin/
+ cp -a "${srcdir}"/qemu-${pkgver}/.libs/libcacard.so* usr/lib/
+}
+
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/qemu-ga.service
===================================================================
--- extra-x86_64/qemu-ga.service 2015-08-20 09:51:23 UTC (rev 244412)
+++ extra-x86_64/qemu-ga.service 2015-08-20 09:51:39 UTC (rev 244413)
@@ -1,8 +0,0 @@
-[Unit]
-Description=QEMU Guest Agent
-
-[Service]
-ExecStart=/usr/bin/qemu-ga
-
-[Install]
-WantedBy=multi-user.target
Copied: qemu/repos/extra-x86_64/qemu-ga.service (from rev 244412,
qemu/trunk/qemu-ga.service)
===================================================================
--- extra-x86_64/qemu-ga.service (rev 0)
+++ extra-x86_64/qemu-ga.service 2015-08-20 09:51:39 UTC (rev 244413)
@@ -0,0 +1,8 @@
+[Unit]
+Description=QEMU Guest Agent
+
+[Service]
+ExecStart=/usr/bin/qemu-ga
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/qemu.install
===================================================================
--- extra-x86_64/qemu.install 2015-08-20 09:51:23 UTC (rev 244412)
+++ extra-x86_64/qemu.install 2015-08-20 09:51:39 UTC (rev 244413)
@@ -1,25 +0,0 @@
-# Arg 1: the new package version
-post_install() {
- # create kvm group
- systemd-sysusers qemu.conf
-
- # trigger events on modules files when already loaded
- for _f in /sys/devices/virtual/misc/{kvm,vhost-net}; do
- [[ -e "$_f" ]] && udevadm trigger "$_f"
- done
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- if (( "$(vercmp $2 0.11)" < 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)" < 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
-}
Copied: qemu/repos/extra-x86_64/qemu.install (from rev 244412,
qemu/trunk/qemu.install)
===================================================================
--- extra-x86_64/qemu.install (rev 0)
+++ extra-x86_64/qemu.install 2015-08-20 09:51:39 UTC (rev 244413)
@@ -0,0 +1,25 @@
+# Arg 1: the new package version
+post_install() {
+ # create kvm group
+ systemd-sysusers qemu.conf
+
+ # trigger events on modules files when already loaded
+ for _f in /sys/devices/virtual/misc/{kvm,vhost-net}; do
+ [[ -e "$_f" ]] && udevadm trigger "$_f"
+ done
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if (( "$(vercmp $2 0.11)" < 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)" < 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
+}
Deleted: extra-x86_64/qemu.sysusers
===================================================================
--- extra-x86_64/qemu.sysusers 2015-08-20 09:51:23 UTC (rev 244412)
+++ extra-x86_64/qemu.sysusers 2015-08-20 09:51:39 UTC (rev 244413)
@@ -1 +0,0 @@
-g kvm 78 -
Copied: qemu/repos/extra-x86_64/qemu.sysusers (from rev 244412,
qemu/trunk/qemu.sysusers)
===================================================================
--- extra-x86_64/qemu.sysusers (rev 0)
+++ extra-x86_64/qemu.sysusers 2015-08-20 09:51:39 UTC (rev 244413)
@@ -0,0 +1 @@
+g kvm 78 -
