From c05eb304e4450e02a3e633c891a5420063fec3ee Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 6 Mar 2014 11:10:29 +0100 Subject: [PATCH] cleanup the libvirt section, use 1.2.1 on all fedoras --- lxc-tags.mk | 3 ++- lxc.mk | 42 ++++-------------------------------------- 2 files changed, 6 insertions(+), 39 deletions(-) diff --git a/lxc-tags.mk b/lxc-tags.mk index 1fb7da53..8e3a0dfe 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -12,7 +12,8 @@ nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@mast pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 codemux-GITPATH := git://git.planet-lab.org/codemux.git@codemux-0.1-15 fprobe-ulog-GITPATH := git://git.planet-lab.org/fprobe-ulog.git@fprobe-ulog-1.1.4-3 -# libvirt - temporarily set in lxc.mk +libvirt-GITPATH := git://git.onelab.eu/libvirt.git@1.2.1 +libvirt-python-GITPATH := git://git.onelab.eu/libvirt-python.git@1.2.1 pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 mom-GITPATH := git://git.planet-lab.org/mom.git@mom-2.3-5 inotify-tools-GITPATH := git://git.planet-lab.org/inotify-tools.git@inotify-tools-3.13-2 diff --git a/lxc.mk b/lxc.mk index 2194a503..80ebec2f 100644 --- a/lxc.mk +++ b/lxc.mk @@ -136,41 +136,11 @@ ALL += fprobe-ulog IN_NODEIMAGE += fprobe-ulog #################### libvirt version selection -# for now things are a bit confused -# on f18 we build with our own 1.0.4 and that works fine -# on f20 we have tried the mainstream (1.1.3) libvirt, -# as well as the latest 1.2.1 release, and both exhibit an issue that needs to be fixed -# in addition once this is done we might need to have f18+1.2.1 as well -# so for now we leave the option to set the following on the command line -# LIBVIRT=104 (for f18) -# LIBVIRT=mainstream (for f20) -# LIBVIRT=121 (for f18 or f20) - -# set default according to distro -ifeq "$(LIBVIRT)" "" -ifeq "$(DISTRONAME)" "f18" -LIBVIRT=104 -else -LIBVIRT=121 -endif -endif +# settling with using version 1.2.1 on all fedoras +# although this does not solve the slice re-creation issue seen on f20 -ifeq "$(LIBVIRT)" "104" -local_libvirt=true -separate_libvirt_python=false -libvirt-GITPATH := git://git.onelab.eu/libvirt.git@libvirt-1.0.4-3 -endif - -ifeq "$(LIBVIRT)" "121" local_libvirt=true separate_libvirt_python=true -libvirt-GITPATH := git://git.onelab.eu/libvirt.git@1.2.1 -libvirt-python-GITPATH := git://git.onelab.eu/libvirt-python.git@1.2.1 -endif - -ifeq "$(LIBVIRT)" "mainstream" -local_libvirt=false -endif # # libvirt @@ -187,18 +157,13 @@ libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub # for 1.2.1 - first seen on f20, not sure for the other ones libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel - -ifeq "$(DISTRONAME)" "f16" -libvirt-STOCK-DEVEL-RPMS += libnl-devel libudev-devel -endif # strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)" libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel netcf-devel -endif ALL += libvirt IN_NODEREPO += libvirt IN_NODEIMAGE += libvirt + endif # @@ -215,6 +180,7 @@ libvirt-python-RPMFLAGS := --define 'packager PlanetLab' ALL += libvirt-python IN_NODEREPO += libvirt-python IN_NODEIMAGE += libvirt-python + endif # -- 2.43.0