X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=a5193103d5f922d46120bd4fe313ad985ea505e0;hb=e202383a51dd6c11437285a8414f464dfe9eca4d;hp=14d43c85a47020c0c4654530f0198e37ba6d620f;hpb=6a1a447db51d83466e778f77f4b0d8d1fb099ac1;p=build.git

diff --git a/lxc.mk b/lxc.mk
index 14d43c85..a5193103 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -30,10 +30,14 @@ IN_NODEIMAGE += transforward
 #
 # procprotect: root context module for protecting against weaknesses in /proc
 #
+### an attempt to remove procprotect from the nodes on f21 now that it has 3.19
+# xxx if that works then we should also tweak nodeimage.pkgs accordingly
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)"
 procprotect-MODULES := procprotect
 procprotect-SPEC := procprotect.spec
 ALL += procprotect
 IN_NODEIMAGE += procprotect
+endif
 
 #
 # ipfw: root context module, and slice companion
@@ -122,11 +126,13 @@ IN_NODEIMAGE += codemux
 #
 # fprobe-ulog
 #
-# xxx temporarily turning this off
+# xxx temporarily turning this off on f20 and f21
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21)"
 fprobe-ulog-MODULES := fprobe-ulog
 fprobe-ulog-SPEC := fprobe-ulog.spec
-#ALL += fprobe-ulog
-#IN_NODEIMAGE += fprobe-ulog
+ALL += fprobe-ulog
+IN_NODEIMAGE += fprobe-ulog
+endif
 
 #################### libvirt version selection
 # settling with using version 1.2.1 on all fedoras
@@ -155,6 +161,7 @@ libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
 libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
 # 1.2.11
 libvirt-STOCK-DEVEL-RPMS += wireshark-devel
+libvirt-STOCK-DEVEL-RPMS += ceph-devel-compat
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt
@@ -170,6 +177,16 @@ libvirt-python-MODULES := libvirt-python
 libvirt-python-SPEC    := libvirt-python.spec
 libvirt-python-BUILD-FROM-SRPM := yes
 libvirt-python-STOCK-DEVEL-RPMS += pm-utils
+# for 1.2.11
+libvirt-python-STOCK-DEVEL-RPMS += python-nose
+# it would make sense to do something like this if we wanted to
+# build against python3 as well, but for now I turned this feature off
+# in libvirt-python
+#ifeq "$(distro)" "Fedora"
+#xxx if $(distrorelease) > 18
+#libvirt-python-STOCK-DEVEL-RPMS += python3-devel python3-nose python3-lxml
+#endif
+#endif
 libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
 libvirt-python-RPMFLAGS :=     --define 'packager PlanetLab'
 ALL += libvirt-python
@@ -239,10 +256,13 @@ vsys-scripts-SPEC := root-context/vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
+# xxx temporarily turning this off on f21
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)"
 vsys-wrapper-MODULES := vsys-scripts
 vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
 IN_SLICEIMAGE += vsys-wrapper
 ALL += vsys-wrapper
+endif
 
 #
 # bind_public