Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9dc94e9f5e104505f20363612b0b352a7c25493
commit e9dc94e9f5e104505f20363612b0b352a7c25493 Author: Marius Cirsta <mcir...@frugalware.org> Date: Fri Aug 12 00:53:13 2016 +0300 libvirt-2.1.0-1-x86_64 * version bump diff --git a/source/xlib-extra/libvirt/FrugalBuild b/source/xlib-extra/libvirt/FrugalBuild index ac72114..f7b2359 100644 --- a/source/xlib-extra/libvirt/FrugalBuild +++ b/source/xlib-extra/libvirt/FrugalBuild @@ -5,7 +5,7 @@ pkgname=libvirt -pkgver=1.3.1 +pkgver=2.1.0 pkgrel=1 pkgdesc="libvirt is a library providing access to information from various virtualization tools" url="http://libvirt.org"; @@ -18,13 +18,17 @@ groups=('xlib-extra') archs=('x86_64' 'i686') up2date="Flasttar http://libvirt.org/sources/"; backup=(etc/sysconfig/libvirtd etc/sysconfig/libvirt-guests etc/libvirt/libvirtd.conf etc/libvirt/libvirt.conf) -source=(http://libvirt.org/sources/$pkgname-$pkgver.tar.gz \ - libvirt-guests fix_iptables_path.patch systemd_path.patch) -sha1sums=('f363e3bd07363277d63b011421d934004d6e1d4d' \ +source=(http://libvirt.org/sources/$pkgname-$pkgver.tar.xz \ + libvirt-guests systemd_path.patch fix_iptables_path.patch \ + libvirt.tmpfiles.d) +sha1sums=('3a0c3f224236efc629c495a278113846b4d78cbf' \ '5dfe166fee4ca188dab779f842aac9868bff265b' \ + '255af8b2c35eb7e1e9a004b0d559fc342e45cfb5' \ '3ef036f94a6903e871e2ae8ea2b01fa81943e375' \ - '59baa39f0d236a2280c2c95c62e69bb783b25f66') -Fconfopts+=" --with-udev --with-avahi --with-init-script=systemd" + '8ef01dd3f08c863eb56b236e41ce5aefaf3181c8') +Fconfopts+=" --with-udev --with-avahi --with-init-script=systemd --without-xen \ + --without-hal --disable-static --with-interface \ + --with-lxc" _F_systemd_units=(libvirtd= libvirt-guests= virtlockd=) Finclude systemd @@ -38,13 +42,8 @@ build() { Fmake Fmakeinstall Frm /var/run - Fmkdir /etc/tmpfiles.d - cat > $Fdestdir/etc/tmpfiles.d/libvirt.conf << EOF -d $Flocalstatedir/run/libvirt/lxc 0755 root root - -d $Flocalstatedir/run/libvirt/network 0755 root root - -d $Flocalstatedir/run/libvirt/qemu 0755 root root - -d $Flocalstatedir/run/libvirt/uml 0755 root root - -EOF + Fmkdir /usr/lib/tmpfiles.d + Ffile libvirt.tmpfiles.d /usr/lib/tmpfiles.d/libvirt.conf Fgenscriptlet Fexe /usr/libexec/libvirt-guests } diff --git a/source/xlib-extra/libvirt/libvirt.tmpfiles.d b/source/xlib-extra/libvirt/libvirt.tmpfiles.d new file mode 100644 index 0000000..2804c43 --- /dev/null +++ b/source/xlib-extra/libvirt/libvirt.tmpfiles.d @@ -0,0 +1,4 @@ +d /run/libvirt/qemu 0755 root root - +d /run/libvirt/lxc 0755 root root - +d /run/libvirt/uml 0755 root root - +d /run/libvirt/network 0755 root root - diff --git a/source/xlib-extra/libvirt/systemd_path.patch b/source/xlib-extra/libvirt/systemd_path.patch index b8616e0..ac73ceb 100644 --- a/source/xlib-extra/libvirt/systemd_path.patch +++ b/source/xlib-extra/libvirt/systemd_path.patch @@ -1,6 +1,6 @@ ---- libvirt-1.2.15/tools/Makefile.am 2015-01-23 13:46:24.000000000 +0200 -+++ libvirt-1.2.15.new/tools/Makefile.am 2015-05-13 00:06:22.000000000 +0300 -@@ -308,7 +308,7 @@ +--- libvirt-2.1.0/tools/Makefile.am 2016-04-26 05:20:09.426241779 +0300 ++++ libvirt-2.1.0.new/tools/Makefile.am 2016-08-11 22:51:41.546543058 +0300 +@@ -367,7 +367,7 @@ EXTRA_DIST += libvirt-guests.service.in @@ -9,25 +9,25 @@ if LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh ---- libvirt-1.2.15/daemon/Makefile.am 2015-04-28 04:15:40.000000000 +0300 -+++ libvirt-1.2.15.new/daemon/Makefile.am 2015-05-13 00:07:20.000000000 +0300 -@@ -387,7 +387,7 @@ +--- libvirt-2.1.0/daemon/Makefile.am 2016-04-26 05:20:09.091245697 +0300 ++++ libvirt-2.1.0.new/daemon/Makefile.am 2016-08-11 23:00:00.708231801 +0300 +@@ -449,7 +449,7 @@ if LIBVIRT_INIT_SCRIPT_SYSTEMD -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system +SYSTEMD_UNIT_DIR = /lib/systemd/system - BUILT_SOURCES += libvirtd.service libvirtd.socket + BUILT_SOURCES += libvirtd.service - install-init-systemd: install-sysconfig libvirtd.service libvirtd.socket ---- libvirt-1.2.15/src/Makefile.am 2015-04-30 12:04:46.000000000 +0300 -+++ libvirt-1.2.15.new/src/Makefile.am 2015-05-13 00:08:11.000000000 +0300 -@@ -2379,7 +2379,7 @@ + install-init-systemd: install-sysconfig libvirtd.service +--- libvirt-2.1.0/src/Makefile.am 2016-07-27 15:39:35.298706138 +0300 ++++ libvirt-2.1.0.new/src/Makefile.am 2016-08-11 23:09:22.347367775 +0300 +@@ -2650,7 +2650,7 @@ if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_SYSTEMD -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system +SYSTEMD_UNIT_DIR = /lib/systemd/system - BUILT_SOURCES += virtlockd.service virtlockd.socket - DISTCLEANFILES += virtlockd.service virtlockd.socket + BUILT_SOURCES += virtlockd.service virtlockd.socket \ + virtlogd.service virtlogd.socket _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
