X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=6d9db043abcd77b178ba8b4025507db40e847c07;hb=b43dca818a496d844c8360059b1bc0e4e0c5b15d;hp=85b0c9d79bdfbd5b4d764637bf159ea3ba2fda10;hpb=4dcd0dfea66d3e6df8425a08d3f102c47aca2228;p=build.git

diff --git a/lxc.mk b/lxc.mk
index 85b0c9d7..6d9db043 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
@@ -130,26 +133,18 @@ 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-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 \
-#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
-# added for 1.0.2 on f16+f18
-#libvirt-DEVEL-RPMS += libattr-devel libssh2-devel
-# added for 1.0.2 on f18
-#ifneq "$(DISTRONAME)" "f16"
-#libvirt-devel-RPMS" += libnl3-devel fuse-devel dbus-devel numad
-#endif
+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
@@ -249,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
 #
@@ -324,26 +324,6 @@ pyaspects-SPEC := pyaspects.spec
 pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
-# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
-# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model
-build_sfa=true
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
-build_sfa=false
-endif
-
-ifeq "$(build_sfa)" "true"
-#
-# sfa - Slice Facility Architecture
-#
-sfa-MODULES := sfa
-sfa-SPEC := sfa.spec
-ALL += sfa
-
-sface-MODULES := sface
-sface-SPEC := sface.spec
-ALL += sface
-endif
-
 #
 # nodeconfig
 #
@@ -494,3 +474,33 @@ release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release
+
+##############################
+# sfa requires python-2.7
+build_sfa=true
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
+build_sfa=false
+endif
+
+ifeq "$(build_sfa)" "true"
+#
+# sfa - Slice Facility Architecture
+#
+sfa-MODULES := sfa
+sfa-SPEC := sfa.spec
+ALL += sfa
+
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
+endif
+
+##############################
+# don't build these by default, we have separate builds for that
+myslice-MODULES := myslice
+myslice-SPEC := myslice.spec
+#ALL += myslice
+
+manifold-MODULES := manifold
+manifold-SPEC := manifold.spec
+#ALL += manifold