update list of repos to watch

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index f12c89b..80ebec2 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -135,21 +135,18 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_NODEIMAGE += fprobe-ulog
 
-#################### using our own libvirt on f18 and f20 
-local_libvirt=false
-separate_libvirt_python=false
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
+#################### libvirt version selection
+# settling with using version 1.2.1 on all fedoras
+# although this does not solve the slice re-creation issue seen on f20
+
 local_libvirt=true
-ifeq "$(DISTRONAME)" "f20"
 separate_libvirt_python=true
-endif
-endif
 
-
-ifeq "$(local_libvirt)" "true"
 #
 # libvirt
 #
+ifeq "$(local_libvirt)" "true"
+
 libvirt-MODULES := libvirt
 libvirt-SPEC    := libvirt.spec
 libvirt-BUILD-FROM-SRPM := yes
@@ -160,24 +157,20 @@ 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
 
-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
@@ -187,6 +180,7 @@ libvirt-python-RPMFLAGS :=     --define 'packager PlanetLab'
 ALL += libvirt-python
 IN_NODEREPO += libvirt-python
 IN_NODEIMAGE += libvirt-python
+
 endif
 
 #
@@ -274,23 +268,6 @@ plcapi-SPEC := plcapi.spec
 ALL += plcapi
 IN_MYPLC += plcapi
 
-#
-# mod_python
-# 
-# this was dropped in fedora18, at which point the intention has been to
-# move to wsgi instead; however our using wsgi currently looks unstable
-# so you have the option to install this manually, in which case myplc will 
-# swap to using mod_python - see plc.d/httpd
-ifeq "$(DISTRO)" "Fedora"
-ifneq "$(DISTRONAME)" "f16"
-mod_python-MODULES := mod_python
-mod_python-SPEC        := mod_python.spec
-mod_python-STOCK-DEVEL-RPMS := httpd-devel
-mod_python-BUILD-FROM-SRPM := yes
-ALL += mod_python
-endif
-endif
-
 #
 # drupal
 #