From 599783f51f040ce4efbee5de3af3c0cf5d3e2e43 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 12 Jan 2013 16:31:22 +0100 Subject: [PATCH] libvirt: update to 1.0.1. --- srcpkgs/libvirt/files/libvirt.tmpfiles.d | 4 ++ srcpkgs/libvirt/libvirt-devel.template | 5 +- srcpkgs/libvirt/libvirt-python.template | 4 +- srcpkgs/libvirt/template | 88 +++++++++++++++++------- 4 files changed, 69 insertions(+), 32 deletions(-) create mode 100644 srcpkgs/libvirt/files/libvirt.tmpfiles.d diff --git a/srcpkgs/libvirt/files/libvirt.tmpfiles.d b/srcpkgs/libvirt/files/libvirt.tmpfiles.d new file mode 100644 index 00000000000..0cec9327142 --- /dev/null +++ b/srcpkgs/libvirt/files/libvirt.tmpfiles.d @@ -0,0 +1,4 @@ +d /var/run/libvirt/qemu 0755 root root - +d /var/run/libvirt/lxc 0755 root root - +d /var/run/libvirt/uml 0755 root root - +d /var/run/libvirt/network 0755 root root - diff --git a/srcpkgs/libvirt/libvirt-devel.template b/srcpkgs/libvirt/libvirt-devel.template index e2543e3a2ff..dbbbdb55bc7 100644 --- a/srcpkgs/libvirt/libvirt-devel.template +++ b/srcpkgs/libvirt/libvirt-devel.template @@ -1,15 +1,12 @@ # Template file for 'libvirt-devel'. # +noarch=yes depends="libvirt>=$version" short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib - vmove "usr/lib/*.a" usr/lib vmove usr/share/gtk-doc usr/share vmove usr/share/doc/libvirt-${version} usr/share/doc } diff --git a/srcpkgs/libvirt/libvirt-python.template b/srcpkgs/libvirt/libvirt-python.template index 3385c3c8cf2..27caca7558d 100644 --- a/srcpkgs/libvirt/libvirt-python.template +++ b/srcpkgs/libvirt/libvirt-python.template @@ -2,9 +2,7 @@ # depends="python" short_desc="${short_desc} - python bindings" -long_desc="${long_desc} - - This package contains the Python language bindings." +pycompile_module="libvirt.py libvirt_qemu.py" do_install() { vmove "usr/lib/python*" usr/lib diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index 01aedc1109c..a10dca7e893 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,37 +1,75 @@ # Template file for 'libvirt' pkgname=libvirt -version=0.10.2 -revision=2 +version=1.0.1 +revision=1 build_style=gnu-configure -configure_args="--without-hal -ac_cv_path_MOUNT=/bin/mount ac_cv_path_UMOUNT=/bin/umount -ac_cv_path_MKFS=/sbin/mkfs ac_cv_path_SHOWMOUNT=/usr/sbin/showmount" -makedepends="pkg-config readline-devel libcap-ng-devel libnl3-devel -gnutls-devel>=3.1.5 libsasl-devel libcurl-devel libpcap-devel libxml2-devel -libparted-devel device-mapper-devel dbus-devel libudev-devel>=183 -libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel -python-devel libblkid-devel libssh2-devel" -fulldepends="lvm2 parted" -subpackages="$pkgname-devel $pkgname-python" -short_desc="The virtualization API" +configure_args="--without-hal --with-storage-lvm --without-xen + --disable-static --with-init-script=systemd + ac_cv_path_MOUNT=/bin/mount ac_cv_path_UMOUNT=/bin/umount + ac_cv_path_MKFS=/sbin/mkfs ac_cv_path_SHOWMOUNT=/usr/sbin/showmount" +subpackages="${pkgname}-devel ${pkgname}-python" +short_desc="The virtualization API for controlling virtualization engines" maintainer="Juan RP " homepage="http://libvirt.org" license="LGPL-2.1" distfiles="http://libvirt.org/sources/$pkgname-$version.tar.gz" -checksum=1fe69ae1268a097cc0cf83563883b51780d528c6493efe3e7d94c4160cc46977 -long_desc=" - libvirt is: - * A toolkit to interact with the virtualization capabilities of recent - versions of Linux (and other OSes). - * Free software available under the GNU Lesser General Public License. - * A long term stable C API - * A set of bindings for common languages - * A CIM provider for the DMTF virtualization schema - * A QMF agent for the AMQP/QPid messaging system" +checksum=4a16c76c46ebc41a6514082b5d95b5d5a0868e7a8cc00ab2e6cc1a23ec6b5a3b + +makedepends="pkg-config readline-devel libcap-ng-devel libnl3-devel + gnutls-devel>=3.1.5 libsasl-devel libcurl-devel libpcap-devel libxml2-devel + libparted-devel device-mapper-devel dbus-devel libudev-devel>=183 + libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel + python-devel libblkid-devel libssh2-devel" + +fulldepends="lvm2 parted" conf_files=" -/etc/libvirt/qemu.conf /etc/libvirt/lxc.conf -/etc/libvirt/libvirtd.conf +/etc/libvirt/qemu-lockd.conf /etc/libvirt/libvirt.conf +/etc/libvirt/qemu/networks/default.xml +/etc/libvirt/qemu/networks/autostart +/etc/libvirt/qemu/networks/autostart/default.xml +/etc/libvirt/nwfilter/qemu-announce-self.xml +/etc/libvirt/nwfilter/allow-ipv4.xml +/etc/libvirt/nwfilter/allow-incoming-ipv4.xml +/etc/libvirt/nwfilter/allow-dhcp.xml +/etc/libvirt/nwfilter/no-other-l2-traffic.xml +/etc/libvirt/nwfilter/no-mac-spoofing.xml +/etc/libvirt/nwfilter/no-other-rarp-traffic.xml +/etc/libvirt/nwfilter/qemu-announce-self-rarp.xml +/etc/libvirt/nwfilter/allow-arp.xml +/etc/libvirt/nwfilter/allow-dhcp-server.xml +/etc/libvirt/nwfilter/no-arp-ip-spoofing.xml +/etc/libvirt/nwfilter/no-arp-mac-spoofing.xml +/etc/libvirt/nwfilter/no-mac-broadcast.xml +/etc/libvirt/nwfilter/no-arp-spoofing.xml +/etc/libvirt/nwfilter/no-ip-spoofing.xml +/etc/libvirt/nwfilter/clean-traffic.xml +/etc/libvirt/nwfilter/no-ip-multicast.xml +/etc/libvirt/qemu.conf +/etc/libvirt/libvirtd.conf /etc/sasl2/libvirt.conf" + +make_dirs=" +/var/cache/libvirt/qemu 0755 root root +/var/lib/libvirt/boot 0755 root root +/var/lib/libvirt/filesystems 0755 root root +/var/lib/libvirt/images 0755 root root +/var/lib/libvirt/network 0755 root root +/var/lib/libvirt/qemu 0755 root root +/var/lib/libvirt/lockd/files 0755 root root +/var/lib/libvirt/lxc 0755 root root +/var/lib/libvirt/dnsmasq 0755 root root +/var/lib/libvirt/uml 0755 root root" + +post_install() { + vmove "lib/*" usr/lib + rm -rf ${DESTDIR}/etc/sysconfig + # Remove sysconfig specific stuff from systemd services. + sed -i -e "/EnvironmentFile.*/d;" ${DESTDIR}/usr/lib/systemd/system/*.service + sed -i -e "s| \$LIBVIRTD_ARGS||;s|@sbindir@|/usr/sbin|g" \ + ${DESTDIR}/usr/lib/systemd/system/*.service + + vinstall ${FILESDIR}/libvirt.tmpfiles.d 644 usr/lib/tmpfiles.d libvirt.conf +}