diff options
| -rw-r--r-- | libraries/libvirt/README | 17 | ||||
| -rw-r--r-- | libraries/libvirt/doinst.sh | 15 | ||||
| -rw-r--r-- | libraries/libvirt/libvirt.SlackBuild | 75 | ||||
| -rw-r--r-- | libraries/libvirt/libvirt.info | 12 | ||||
| -rw-r--r-- | libraries/libvirt/slack-desc | 10 |
5 files changed, 49 insertions, 80 deletions
diff --git a/libraries/libvirt/README b/libraries/libvirt/README index 5707e1254e..ae63f423ca 100644 --- a/libraries/libvirt/README +++ b/libraries/libvirt/README @@ -3,15 +3,11 @@ libvirt - The virtualization API libvirt is a toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). -You can enable other optional (not-autodetected) features -by passing some variables to the script -(VAR=yes|no ./libvirt.SlackBuild): -VIRTGROUP=somegroup (default: users) qemu group used -XEN=yes|no (default: no) Xen support -OPENVZ=yes|no (default: no) OpenVZ support -VMWARE=yes|no (default: no) VMware support -ESX=yes|no (default: no) ESX support -VBOX=yes|no (default: no) VirtualBox support +Most dependencies are autodetected and having the required +libs in place will build the respective features automatically. + +The group can be specified at build time like this: +VIRTGROUP=somegroup ./libvirt.SlackBuild (default: users) If you want to start the libvirt daemon at boot, add this to /etc/rc.d/rc.local @@ -21,5 +17,4 @@ if [ -x /etc/rc.d/rc.libvirt ]; then /etc/rc.d/rc.libvirt start fi -Have a look at the commented part of rc.libvirt for some -gotchas. +Have a look at the commented part of rc.libvirt for some gotchas. diff --git a/libraries/libvirt/doinst.sh b/libraries/libvirt/doinst.sh index 9ca1b21e7e..e1b32b324d 100644 --- a/libraries/libvirt/doinst.sh +++ b/libraries/libvirt/doinst.sh @@ -1,4 +1,3 @@ -#!/bin/sh config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -12,4 +11,16 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/rc.d/rc.libvirt.new +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.libvirt.new + diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index fd42760df3..4fe8e6cde2 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -2,9 +2,10 @@ # Slackware build script for libvirt # Written by Michal Bialozor <bialyy@o2.pl> +# Maintained by Bogdan Radulescu <bogdan@nimblex.net> PRGNAM=libvirt -VERSION=${VERSION:-0.10.2} +VERSION=${VERSION:-1.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -39,42 +40,12 @@ PYTHONSITEPKG=$(python -c "import sys, os; print os.path.join('/usr/lib${LIBDIRS VIRTGROUP=${VIRTGROUP:-users} -if [ "${OPENVZ:-no}" = "no" ]; then - enable_openvz="--without-openvz" -else - enable_openvz="--with-openvz" -fi - -if [ "${XEN:-no}" = "no" ]; then - enable_xen="--without-xen" -else - enable_xen="--with-xen" -fi - -if [ "${VMWARE:-no}" = "no" ]; then - enable_vmware="--without-vmware" -else - enable_vmware="--with-vmware" -fi - -if [ "${ESX:-no}" = "no" ]; then - enable_esx="--without-esx" -else - enable_esx="--with-esx" -fi - -if [ "${VBOX:-no}" = "no" ]; then - enable_vbox="--without-vbox" -else - enable_vbox="--with-vbox" -fi - set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION $PRGNAM-doinst-additions +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . @@ -95,14 +66,7 @@ CFLAGS="$SLKCFLAGS" \ --with-yajl \ --with-python=/usr \ --with-qemu-group=$VIRTGROUP \ - $enable_xen \ - $enable_openvz \ - $enable_vmware \ - $enable_esx \ - $enable_vbox \ - --with-init-script=none \ - --without-hal \ - --build=$ARCH-slackware-linux + --with-init-script=none make \ HTML_DIR=/usr/doc/$PRGNAM-$VERSION \ @@ -112,20 +76,10 @@ make \ EXAMPLE_DIR=/usr/doc/$PRGNAM-$VERSION/examples \ install-strip DESTDIR=$PKG -# don't clobber existing configuration files -for i in etc/libvirt{,/nwfilter,/qemu/networks} etc/{logrotate.d,sasl2,sysctl.d}; do - for j in $(ls -1 $PKG/$i); do - if [ ! -d $PKG/$i/$j ]; then - mv $PKG/$i/$j{,.new} - echo "config $i/$j.new" >> $TMP/$PRGNAM-doinst-additions - fi - done -done - # add an rc.libvirt to start/stop/restart the daemon install -D -m 0755 $CWD/rc.libvirt $PKG/etc/rc.d/rc.libvirt.new -# we use $VIRTGROUP as our virtualization group, fix auth permissions and +# we use $VIRTGROUP as our virtualization group, fix auth permissions, and # consider the fact that by default we got no certs sed -i \ -e "s|^\#unix_sock_group\ =\ \"libvirt\"|unix_sock_group = \"$VIRTGROUP\"|" \ @@ -133,27 +87,36 @@ sed -i \ -e "s|^\#auth_unix_ro.*|auth_unix_ro = \"none\"|" \ -e "s|^\#auth_unix_rw.*|auth_unix_rw = \"none\"|" \ -e "s|^\#listen_tls|listen_tls|" \ - $PKG/etc/libvirt/libvirtd.conf.new + $PKG/etc/libvirt/libvirtd.conf # still, we use $VIRTGROUP as our virtualization group sed -i \ -e "s|^\#group\ =\ \"root\"|group = \"$VIRTGROUP\"|" \ - $PKG/etc/libvirt/qemu.conf.new + $PKG/etc/libvirt/qemu.conf find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - ABOUT-NLS AUTHORS ChangeLog COPYING* INSTALL README NEWS TODO \ + AUTHORS ChangeLog COPYING* INSTALL README NEWS TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -rm -rf $PKG/usr/share/doc +rm -r $PKG/usr/share/doc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -cat $TMP/$PRGNAM-doinst-additions >> $PKG/install/doinst.sh + +# Don't clobber existing configuration files +for i in etc/libvirt{,/nwfilter,/qemu/networks} etc/{logrotate.d,sasl2,sysctl.d}; do + for j in $(ls -1 $PKG/$i); do + if [ ! -d $PKG/$i/$j ]; then + mv $PKG/$i/$j{,.new} + echo "config $i/$j.new" >> $PKG/install/doinst.sh + fi + done +done cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index e79c2363d0..9a027ae030 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,10 +1,10 @@ PRGNAM="libvirt" -VERSION="0.10.2" +VERSION="1.0.3" HOMEPAGE="http://libvirt.org" -DOWNLOAD="http://libvirt.org/sources/libvirt-0.10.2.tar.gz" -MD5SUM="a5e50860d9da238ba270b528411c4a0d" +DOWNLOAD="http://libvirt.org/sources/libvirt-1.0.3.tar.gz" +MD5SUM="3d9f85d586c9aa3d819b626622f3fc97" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="yajl" -MAINTAINER="Michal Bialozor" -EMAIL="bialyy@o2.pl" +REQUIRES="yajl urlgrabber" +MAINTAINER="Bogdan Radulescu" +EMAIL="bogdan@nimblex.net" diff --git a/libraries/libvirt/slack-desc b/libraries/libvirt/slack-desc index 34c10f8593..4208954d0d 100644 --- a/libraries/libvirt/slack-desc +++ b/libraries/libvirt/slack-desc @@ -1,9 +1,9 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| libvirt: libvirt (The virtualization API) |