Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --git a/lxc-tags.mk b/lxc-tags.mk
index bcd38cf..6b8eb46 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -19,6 +19,7 @@ libvirt-GITPATH                 := git://git.onelab.eu/libvirt.git@libvirt-1.0.4
 # 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
 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

diff --git a/lxc.mk b/lxc.mk
index dfcb2d6..aa49d48 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -137,9 +137,14 @@ IN_NODEIMAGE += fprobe-ulog
 
 #################### using our own libvirt on f18, and the stock version later on
 local_libvirt=false
+separate_libvirt_python=false
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
 local_libvirt=true
+ifeq "$(DISTRONAME)" "f20"
+separate_libvirt_python=true
 endif
+endif
+
 
 ifeq "$(local_libvirt)" "true"
 #
@@ -170,6 +175,21 @@ IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt
 endif
 
+ifeq "$(separate_libvirt_python)" "true"
+#
+## libvirt-python
+#
+libvirt-python-MODULES := libvirt-python
+libvirt-python-SPEC    := libvirt-python.spec
+libvirt-python-BUILD-FROM-SRPM := yes
+libvirt-python-STOCK-DEVEL-RPMS += gnutls-utils nc pm-utils 
+libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
+libvirt-python-RPMFLAGS :=     --define 'packager PlanetLab'
+ALL += libvirt-python
+IN_NODEREPO += libvirt-python
+IN_NODEIMAGE += libvirt-python
+endif
+
 #
 # DistributedRateLimiting
 #