Date: Tue, 21 Jan 2014 16:45:04 -0800 From: Jason Helfman <jgh@FreeBSD.org> To: bug-followup <bug-followup@freebsd.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r340676 - in head/devel/libvirt: . files Message-ID: <CAMuy=%2BhVgWm1TLyyEouHK%2BnTTdbUc01ob=1CidazkTdeZaeSOw@mail.gmail.com> In-Reply-To: <201401220016.s0M0GjDl047239@svn.freebsd.org> References: <201401220016.s0M0GjDl047239@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Wrong PR was noted (forwarding contents to GNATS): Correct pr is 185745 On Tue, Jan 21, 2014 at 4:16 PM, Jason Helfman <jgh@freebsd.org> wrote: > Author: jgh > Date: Wed Jan 22 00:16:44 2014 > New Revision: 340676 > URL: http://svnweb.freebsd.org/changeset/ports/340676 > QAT: https://qat.redports.org/buildarchive/r340676/ > > Log: > - add rc.d script for libvirtd daemon control [1] > - rename option description for qemu > - fix qemu dependencies for libvirtd operations > - strip libraries > - add pkg-message > > Many thanks to roman@ for testing! > > PR: 168656 [1] > http://www.FreeBSD.org/cgi/query-pr.cgi?pr=168656 > Submitted by: dpejesh@yahoo.com > > Added: > head/devel/libvirt/files/ > head/devel/libvirt/files/libvirtd.in (contents, props changed) > head/devel/libvirt/pkg-message (contents, props changed) > Modified: > head/devel/libvirt/Makefile > > Modified: head/devel/libvirt/Makefile > > ============================================================================== > --- head/devel/libvirt/Makefile Tue Jan 21 23:47:07 2014 (r340675) > +++ head/devel/libvirt/Makefile Wed Jan 22 00:16:44 2014 (r340676) > @@ -3,6 +3,7 @@ > > PORTNAME= libvirt > PORTVERSION= 1.2.1 > +PORTREVISION= 1 > CATEGORIES= devel > MASTER_SITES= http://libvirt.org/sources/ \ > ftp://libvirt.org/libvirt/ > @@ -19,19 +20,24 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/ > libssh2.so:${PORTSDIR}/security/libssh2 > > OPTIONS_DEFINE= QEMU DOCS NLS > -QEMU_DESC= QEMU bindings > +QEMU_DESC= QEMU driver > > OPTIONS_SUB= yes > > -QEMU_CONFIGURE_WITH= qemu > +QEMU_CONFIGURE_WITH= qemu yajl > +QEMU_CFLAGS= -I${LOCALBASE}/include > +QEMU_LIB_DEPENDS= libyajl.so:${PORTSDIR}/devel/yajl > +QEMU_RUN_DEPENDS= dmidecode:${PORTSDIR}/sysutils/dmidecode \ > + qemu-io:${PORTSDIR}/emulators/qemu-devel > > NLS_USES= gettext > NLS_CONFIGURE_ENABLE= nls > NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE} > > +USE_RC_SUBR= libvirtd > + > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --without-sasl \ > - --without-yajl \ > --without-avahi \ > --without-polkit \ > --without-hal \ > @@ -59,6 +65,13 @@ SHLIB_VER= 1002 > PLIST_SUB= PORTVERSION="-${PORTVERSION}" \ > SHLIB_VER=${SHLIB_VER} > PORTDOCS= * > +STRIP_FILES= libvirt.so.${SHLIB_VER} \ > + libvirt-qemu.so.${SHLIB_VER} \ > + libvirt-lxc.so.${SHLIB_VER} \ > + 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 > > .include <bsd.port.options.mk> > > @@ -90,12 +103,14 @@ post-install: > ${ECHO_MSG} " Preserving local configuration > file: ${STAGEDIR}${ETCDIR}/$${configuration}.conf"; \ > fi; \ > done > -.if ${PORT_OPTIONS:MDOCS} > @${MKDIR} ${STAGEDIR}${DOCSDIR} > .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO > ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} > .endfor > -.endif > + > +.for lib in ${STRIP_FILES} > + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib} > +.endfor > > regression-test: build > @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} check > > Added: head/devel/libvirt/files/libvirtd.in > > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/devel/libvirt/files/libvirtd.in Wed Jan 22 00:16:44 2014 > (r340676) > @@ -0,0 +1,31 @@ > +#!/bin/sh > + > +# $FreeBSD$ > +# > +# PROVIDE: libvirtd > +# REQUIRE: LOGIN > +# KEYWORD: shutdown > +# > +# Add the following line to /etc/rc.conf[.local] to enable libvirtd. > +# > +# libvirtd_enable (bool): Set to 'YES' to enable > +# Default: NO > +# > + > +. /etc/rc.subr > + > +name=libvirtd > +rcvar=libvirtd_enable > + > +load_rc_config $name > + > +command=%%PREFIX%%/sbin/libvirtd > +pidfile=%%LOCALBASE%%/var/run/${name}.pid > + > +command_args="--daemon --pid-file=${pidfile}" > + > +: ${libvirtd_enable:="NO"} > + > +PATH="${PATH}:/usr/local/sbin:/usr/local/bin" > + > +run_rc_command "$1" > > Added: head/devel/libvirt/pkg-message > > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/devel/libvirt/pkg-message Wed Jan 22 00:16:44 2014 > (r340676) > @@ -0,0 +1,3 @@ > + > +To enable libvirtd please add libvirtd_enable="YES" to > +/etc/rc.conf. > > -- Jason Helfman | FreeBSD Committer jgh@FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMuy=%2BhVgWm1TLyyEouHK%2BnTTdbUc01ob=1CidazkTdeZaeSOw>