X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=lxc.mk;h=0e11b4fb626845296a7630de7997077950bb8dd8;hb=839c283263dd11e1d0094a6bde1530a869e65d9f;hp=d21953d43150bae8134527ce5c17721c571f37ff;hpb=94a5da20c23b50b0dd1bf9e0eb366057d3a5a2f4;p=build.git

diff --git a/lxc.mk b/lxc.mk
index d21953d4..0e11b4fb 100644
--- 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
@@ -129,21 +132,19 @@ ifeq "$(local_libvirt)" "true"
 libvirt-MODULES := libvirt
 libvirt-SPEC    := libvirt.spec
 libvirt-BUILD-FROM-SRPM := yes
-libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel gettext 
-libvirt-DEVEL-RPMS += python-devel libcap-ng-devel libpciaccess-devel radvd numactl-devel 
-libvirt-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas 
-libvirt-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub ceph-devel
-# added for 0.10.2 
-libvirt-DEVEL-RPMS += xen-devel sanlock-devel avahi-devel cyrus-sasl-devel polkit qemu-img lvm2
-libvirt-DEVEL-RPMS += iscsi-initiator-utils parted-devel libssh2-devel netcf-devel libwsman-devel
-libvirt-DEVEL-RPMS += audit-libs-devel nfs-utils libblkid-devel
-# The --without options are breaking spec2make
-#libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
-#	                --without storage-fs --without storage-lvm \
-#	                --without polkit --without sasl --without audit --with capng --with udev \
-#	                --without netcf --without avahi --without sanlock \
-#	                --without xen --without qemu --without hyperv --without phyp --without esx \
-#	                --without libxl \
+# The --without options are breaking spec2make : hard-wired in the specfile instead
+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 
+endif
 libvirt-RPMFLAGS :=	--define 'packager PlanetLab'
 ALL += libvirt
 IN_NODEREPO += libvirt
@@ -243,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
 #