trying out ipfw's from the new sourceforge repo on all fedora's

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index e2db06b..0e11b4f 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -46,6 +46,8 @@ IN_NODEIMAGE += procprotect
 #
 # ipfw: root context module, and slice companion
 #
+# starting on 2013-03-05 when f18 has moved to kernel 3.8 this module won't build anymore
+#ifeq "$(DISTRONAME)" "f16"
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ALL += ipfwroot
@@ -54,6 +56,7 @@ IN_NODEIMAGE += ipfwroot
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
 ALL += ipfwslice
+#endif
 
 #
 # NodeUpdate
@@ -130,13 +133,14 @@ libvirt-MODULES := libvirt
 libvirt-SPEC    := libvirt.spec
 libvirt-BUILD-FROM-SRPM := yes
 # The --without options are breaking spec2make : hard-wired in the specfile instead
-libvirt-DEVEL-RPMS += xhtml1-dtds gettext libtasn1-devel gnutls-devel 
+libvirt-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel 
 libvirt-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel 
 libvirt-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel 
 libvirt-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub 
 ifeq "$(DISTRONAME)" "f16"
 libvirt-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)" "f18"
 libvirt-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad 
 libvirt-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 
@@ -240,6 +244,11 @@ bind_public-SPEC := bind_public.spec
 IN_SLICEIMAGE += bind_public
 ALL += bind_public
 
+sliver-openvswitch-MODULES := sliver-openvswitch
+sliver-openvswitch-SPEC := sliver-openvswitch.spec
+IN_SLICEIMAGE += sliver-openvswitch
+ALL += sliver-openvswitch
+
 #
 # plcapi
 #