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

diff --git a/lxc.mk b/lxc.mk
index 8a4bd9b8..14d43c85 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -38,8 +38,6 @@ IN_NODEIMAGE += procprotect
 #
 # 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
@@ -48,7 +46,6 @@ IN_NODEIMAGE += ipfwroot
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
 ALL += ipfwslice
-endif
 
 #
 # comgt - a companion to umts tools
@@ -125,10 +122,11 @@ IN_NODEIMAGE += codemux
 #
 # fprobe-ulog
 #
+# xxx temporarily turning this off
 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
@@ -155,6 +153,8 @@ libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
 # strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
 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
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt