From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sun, 21 Dec 2014 16:43:38 +0000 (+0100)
Subject: turning off problematic builds on f21 more carefully
X-Git-Tag: 5.3.7~22
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=6905a2f3ba95975c38df315275d20054d8f4ac6b

turning off problematic builds on f21 more carefully
so far: fprobe-ulog and vsys-wrapper
---

diff --git a/lxc.mk b/lxc.mk
index f852ab86..5245a3ad 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -122,11 +122,13 @@ IN_NODEIMAGE += codemux
 #
 # fprobe-ulog
 #
-# xxx temporarily turning this off
+# xxx temporarily turning this off on f21
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),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
@@ -249,10 +251,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