From: Mohamed Larabi Date: Fri, 28 Feb 2014 14:34:45 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.3.2~37 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b212ca031dbce0376d8b5ce868bfd52e29d7c0d4;hp=6d52e13ce56b5c9c5ccd153d525ba638b4f68749;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/lxc-tags.mk b/lxc-tags.mk index b0240d13..1fb7da53 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -12,15 +12,7 @@ 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 -# tmp - hopefully we can get to use the same version on both -ifeq "$(DISTRONAME)" "f18" -# this is a tag -libvirt-GITPATH := git://git.onelab.eu/libvirt.git@libvirt-1.0.4-3 -# this is an ongoing branch -else -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 +# libvirt - temporarily set in lxc.mk 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 @@ -53,7 +45,7 @@ nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@master myplc-GITPATH := git://git.planet-lab.org/myplc.git@master # -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-1 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-2 #sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9 # myslice-GITPATH := git://git.onelab.eu/myslice.git@master diff --git a/lxc.mk b/lxc.mk index f996e24a..2194a503 100644 --- a/lxc.mk +++ b/lxc.mk @@ -135,21 +135,48 @@ fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog IN_NODEIMAGE += fprobe-ulog -#################### using our own libvirt on f18 and f20 -local_libvirt=false +#################### 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 + +ifeq "$(LIBVIRT)" "104" +local_libvirt=true separate_libvirt_python=false -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)" +libvirt-GITPATH := git://git.onelab.eu/libvirt.git@libvirt-1.0.4-3 +endif + +ifeq "$(LIBVIRT)" "121" local_libvirt=true -ifeq "$(DISTRONAME)" "f20" separate_libvirt_python=true -endif +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 -ifeq "$(local_libvirt)" "true" # # libvirt # +ifeq "$(local_libvirt)" "true" + libvirt-MODULES := libvirt libvirt-SPEC := libvirt.spec libvirt-BUILD-FROM-SRPM := yes @@ -174,10 +201,11 @@ IN_NODEREPO += libvirt IN_NODEIMAGE += libvirt endif -ifeq "$(separate_libvirt_python)" "true" # ## libvirt-python # +ifeq "$(separate_libvirt_python)" "true" + libvirt-python-MODULES := libvirt-python libvirt-python-SPEC := libvirt-python.spec libvirt-python-BUILD-FROM-SRPM := yes diff --git a/mlab-tags.mk b/mlab-tags.mk index f2056f68..f79105f6 100644 --- a/mlab-tags.mk +++ b/mlab-tags.mk @@ -44,7 +44,7 @@ pyopenssl-GITPATH := git://git.planet-lab.org/pyopenssl.git@pyopen pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-3 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 ### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-1 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-2 sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.2-3 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.2-1 diff --git a/onelab-tags.mk b/onelab-tags.mk index 3260ab68..0833e03d 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -50,7 +50,7 @@ myplc-GITPATH := git://git.onelab.eu/myplc.git@master DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 # -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-1 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-2 #sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.9-9 # myslice-GITPATH := git://git.onelab.eu/myslice.git@master diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index a954a8ab..2fc6340c 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -42,7 +42,7 @@ pyopenssl-GITPATH := git://git.planet-lab.org/pyopenssl.git@pyopen pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-3 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 ### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-1 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-2 sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.2-3 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.2-1