Merge branch 'core110'

[people/pmueller/ipfire-2.x.git] / lfs / libvirt

diff --git a/lfs/libvirt b/lfs/libvirt
index 996d32ecd303c2471cbe905c40dbcb53f171959e..963fdf9d2e47f4d107c9706e0264df25537dc3c2 100644 (file)
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.5.0
+VER        = 3.1.0
 
 THISAPP    = libvirt-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = libvirt
-PAK_VER    = 12
+PAK_VER    = 13
 
 DEPS       = "libpciaccess libyajl ncat qemu"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 001af1ca2545971c6b46628678fd4afa
+$(DL_FILE)_MD5 = e31aa7e0a1635e72fdc140c10a677895
 
 install : $(TARGET)
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -89,8 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --without-storage-scsi --without-storage-mpath --without-storage-disk --without-storage-rbd --without-storage-sheepdog --without-storage-gluster  --without-storage-zfs
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
-       install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/libvirtd /etc/rc.d/init.d/libvirtd
-       install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/virtlogd /etc/rc.d/init.d/virtlogd
+       #install initscripts
+       $(call INSTALL_INITSCRIPT,libvirtd)
+       $(call INSTALL_INITSCRIPT,virtlogd)
        mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests
        # Backup
        install -v -m 644 $(DIR_SRC)/config/backup/includes/libvirt /var/ipfire/backup/addons/includes/libvirt