Attachment 146081 Details for Bug 192441 – libvirt 1.2.7 and /var

[patch] libvirt 1.2.7 and /var

libvirt.diff (text/plain), 4.52 KB, created by Jason Helfman on 2014-08-20 18:41:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Helfman

Created: 2014-08-20 18:41:39 UTC

Size: 4.52 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 365469)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	libvirt
>-PORTVERSION=	1.2.6
>-PORTREVISION=	2
>+PORTVERSION=	1.2.7
> CATEGORIES=	devel
> MASTER_SITES=	http://libvirt.org/sources/ \
> 		ftp://libvirt.org/libvirt/
>@@ -40,6 +39,8 @@
> NLS_CONFIGURE_ENABLE=	nls
> NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
> 
>+VARDIR=		/var
>+
> USE_RC_SUBR=	libvirtd
> 
> GNU_CONFIGURE=	yes
>@@ -52,7 +53,8 @@
> 		--without-sysctl \
> 		--without-lxc \
> 		--without-uml \
>-		--with-ssh2
>+		--with-ssh2 \
>+		--localstatedir=${VARDIR}
> 
> # workaround to override pkg-config calls
> # random_data fix can be removed when 8.x is eol
>@@ -78,7 +80,8 @@
> 		libvirt/lock-driver/lockd.so \
> 		libvirt/connection-driver/libvirt_driver_vbox.so \
> 		libvirt/connection-driver/libvirt_driver_secret.so \
>-		libvirt/connection-driver/libvirt_driver_storage.so
>+		libvirt/connection-driver/libvirt_driver_storage.so \
>+		libvirt/connection-driver/libvirt_driver_network.so
> 
> .include <bsd.port.options.mk>
> 
>@@ -91,6 +94,10 @@
> PLIST_SUB+=	BHYVE="@comment "
> .endif
> 
>+.if ${PORT_OPTIONS:MBHYVE}
>+STRIP_FILES+=	libvirt/connection-driver/libvirt_driver_bhyve.so
>+.endif
>+
> post-patch:
> .if ${OSVERSION} < 900000
> 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||' \
>@@ -123,6 +130,23 @@
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
> .endfor
> 
>+.for dir in run/libvirt/network \
>+	run/libvirt/qemu \
>+	run/libvirt/lockd \
>+	log/libvirt/uml \
>+	log/libvirt/qemu \
>+	log/libvirt/lxc \
>+	lib/libvirt/boot \
>+	lib/libvirt/lockd/files \
>+	lib/libvirt/images \
>+	lib/libvirt/dnsmasq \
>+	lib/libvirt/filesystems \
>+	lib/libvirt/network \
>+	lib/libvirt/qemu/channel/target \
>+	cache/libvirt/qemu
>+	@${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}"
>+.endfor
>+
> regression-test: build
> 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 365469)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (libvirt-1.2.6.tar.gz) = 38a224559a1d04e5d4163c5c1b810df1f29804ebbb1f057d4abcb41a9e5d5dea
>-SIZE (libvirt-1.2.6.tar.gz) = 29346718
>+SHA256 (libvirt-1.2.7.tar.gz) = 3dfb462cba1188d2c9ba700e1927fa0dbd71f20afdf81ab0c43b27b7fe77defc
>+SIZE (libvirt-1.2.7.tar.gz) = 29676178
>Index: files/libvirtd.in
>===================================================================
>--- files/libvirtd.in	(revision 365469)
>+++ files/libvirtd.in	(working copy)
>@@ -20,7 +20,7 @@
> load_rc_config $name
> 
> command=%%PREFIX%%/sbin/libvirtd
>-pidfile=%%LOCALBASE%%/var/run/${name}.pid
>+pidfile=/var/run/${name}.pid
> 
> command_args="--daemon --pid-file=${pidfile}"
> 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 365469)
>+++ pkg-plist	(working copy)
>@@ -333,29 +333,28 @@
> @dirrmtry %%ETCDIR%%/qemu/networks
> @dirrmtry %%ETCDIR%%/qemu
> @dirrm %%ETCDIR%%
>-@dirrmtry var/run/libvirt/network
>-%%QEMU%%@dirrmtry var/run/libvirt/qemu
>-@dirrmtry var/run/libvirt/lockd
>-@dirrmtry var/run/libvirt
>-@dirrmtry var/run
>-@dirrmtry var/log/libvirt/uml
>-@dirrmtry var/log/libvirt/qemu
>-@dirrmtry var/log/libvirt/lxc
>-@dirrmtry var/log/libvirt
>-@dirrmtry var/log
>-@dirrmtry var/lib/libvirt/lockd/files
>-@dirrmtry var/lib/libvirt/lockd
>-@dirrmtry var/lib/libvirt/images
>-@dirrmtry var/lib/libvirt/boot
>-@dirrmtry var/lib/libvirt/dnsmasq
>-@dirrmtry var/lib/libvirt/filesystems
>-@dirrmtry var/lib/libvirt/network
>-%%QEMU%%@dirrmtry var/lib/libvirt/qemu/channel/target
>-%%QEMU%%@dirrmtry var/lib/libvirt/qemu/channel
>-%%QEMU%%@dirrmtry var/lib/libvirt/qemu
>-@dirrmtry var/lib/libvirt
>-@dirrmtry var/lib
>-%%QEMU%%@dirrmtry var/cache/libvirt/qemu
>-@dirrmtry var/cache/libvirt
>-@dirrmtry var/cache
>-@dirrmtry var
>+@dirrmtry /var/run/libvirt/network
>+@dirrmtry /var/run/libvirt/qemu
>+@dirrmtry /var/run/libvirt/lockd
>+@dirrmtry /var/run/libvirt
>+@dirrmtry /var/run
>+@dirrmtry /var/log/libvirt/uml
>+@dirrmtry /var/log/libvirt/qemu
>+@dirrmtry /var/log/libvirt/lxc
>+@dirrmtry /var/log/libvirt
>+@dirrmtry /var/log
>+@dirrmtry /var/lib/libvirt/lockd/files
>+@dirrmtry /var/lib/libvirt/lockd
>+@dirrmtry /var/lib/libvirt/images
>+@dirrmtry /var/lib/libvirt/boot
>+@dirrmtry /var/lib/libvirt/dnsmasq
>+@dirrmtry /var/lib/libvirt/filesystems
>+@dirrmtry /var/lib/libvirt/network
>+@dirrmtry /var/lib/libvirt/qemu/channel/target
>+@dirrmtry /var/lib/libvirt/qemu/channel
>+@dirrmtry /var/lib/libvirt/qemu
>+@dirrmtry /var/lib/libvirt
>+@dirrmtry /var/lib
>+@dirrmtry /var/cache/libvirt/qemu
>+@dirrmtry /var/cache/libvirt
>+@dirrmtry /var/cache

Actions: View | Diff

Attachments on bug 192441: 145421 | 145424 | 146081