#
# 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
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ALL += ipfwslice
+#endif
#
# NodeUpdate
ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
-#################### libvirt on f16 is too old, sounds like f17 has something fine
-local_libvirt=false
-ifeq "$(DISTRONAME)" "f16"
+#################### using our own libvirt on all distros for now
+#local_libvirt=false
+#ifeq "$(DISTRONAME)" "f16"
local_libvirt=true
-endif
+#endif
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
-# 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
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
#
plcapi-MODULES := plcapi
-plcapi-SPEC := PLCAPI.spec
+plcapi-SPEC := plcapi.spec
ALL += plcapi
IN_MYPLC += plcapi
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
#
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