git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
turn off fprobe-ulog until it builds again - this is to assess the f21 build
[build.git]
/
lxc.mk
diff --git
a/lxc.mk
b/lxc.mk
index
8a4bd9b
..
8e65b92
100644
(file)
--- a/
lxc.mk
+++ b/
lxc.mk
@@
-38,8
+38,6
@@
IN_NODEIMAGE += procprotect
#
# ipfw: root context module, and slice companion
#
#
# ipfw: root context module, and slice companion
#
-# this module won't build yet under f20
-ifeq "$(DISTRONAME)" "f18"
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ALL += ipfwroot
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ALL += ipfwroot
@@
-48,7
+46,6
@@
IN_NODEIMAGE += ipfwroot
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ALL += ipfwslice
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ALL += ipfwslice
-endif
#
# comgt - a companion to umts tools
#
# comgt - a companion to umts tools
@@
-125,10
+122,11
@@
IN_NODEIMAGE += codemux
#
# fprobe-ulog
#
#
# fprobe-ulog
#
+# xxx temporarily turning this off
fprobe-ulog-MODULES := fprobe-ulog
fprobe-ulog-SPEC := fprobe-ulog.spec
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
#################### libvirt version selection
# settling with using version 1.2.1 on all fedoras
#################### libvirt version selection
# settling with using version 1.2.1 on all fedoras