#
# 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"
+# this module won't build yet under f20
+ifeq "$(DISTRONAME)" "f18"
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ALL += ipfwroot
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ALL += ipfwslice
-#endif
+endif
+
+#
+# comgt - a companion to umts tools
+#
+comgt-MODULES := comgt
+comgt-SPEC := comgt.spec
+IN_NODEIMAGE += comgt
+ALL += comgt
+
+#
+# umts: root context stuff
+#
+umts-backend-MODULES := planetlab-umts-tools
+umts-backend-SPEC := backend.spec
+IN_NODEIMAGE += umts-backend
+ALL += umts-backend
+
+#
+# umts: slice tools
+#
+umts-frontend-MODULES := planetlab-umts-tools
+umts-frontend-SPEC := frontend.spec
+IN_SLICEIMAGE += umts-frontend
+ALL += umts-frontend
#
# NodeUpdate
ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
-#################### using our own libvirt on all distros for now
-#local_libvirt=false
-#ifeq "$(DISTRONAME)" "f16"
+#################### using our own libvirt on f18, and the stock version later on
+local_libvirt=false
+separate_libvirt_python=false
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
local_libvirt=true
-#endif
+ifeq "$(DISTRONAME)" "f20"
+separate_libvirt_python=true
+endif
+endif
+
ifeq "$(local_libvirt)" "true"
#
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 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
+libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel
+libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel
+libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel
+libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
+# for 1.2.1 - first seen on f20, not sure for the other ones
+libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
+
ifeq "$(DISTRONAME)" "f16"
-libvirt-DEVEL-RPMS += libnl-devel libudev-devel
+libvirt-STOCK-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
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
+libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel
endif
libvirt-RPMFLAGS := --define 'packager PlanetLab'
ALL += libvirt
IN_NODEIMAGE += libvirt
endif
+ifeq "$(separate_libvirt_python)" "true"
+#
+## libvirt-python
+#
+libvirt-python-MODULES := libvirt-python
+libvirt-python-SPEC := libvirt-python.spec
+libvirt-python-BUILD-FROM-SRPM := yes
+libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
+libvirt-python-RPMFLAGS := --define 'packager PlanetLab'
+ALL += libvirt-python
+IN_NODEREPO += libvirt-python
+IN_NODEIMAGE += libvirt-python
+endif
+
#
# DistributedRateLimiting
#
#ALL += mom
#IN_NODEIMAGE += mom
-#
-# inotify-tools - local import
-# rebuild this on centos5 (not found) - see yumexclude
-#
-local_inotify_tools=false
-ifeq "$(DISTRONAME)" "centos5"
-local_inotify_tools=true
-endif
-
-ifeq "$(DISTRONAME)" "sl6"
-local_inotify_tools=true
-endif
-
-ifeq "$(local_inotify_tools)" "true"
-inotify-tools-MODULES := inotify-tools
-inotify-tools-SPEC := inotify-tools.spec
-inotify-tools-BUILD-FROM-SRPM := yes
-IN_NODEIMAGE += inotify-tools
-ALL += inotify-tools
-endif
-
#
# openvswitch
#
# openvswitch-MODULES := openvswitch
# openvswitch-SPEC := openvswitch.spec
-# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+# openvswitch-STOCK-DEVEL-RPMS += kernel-devel
# IN_NODEIMAGE += openvswitch
# # build only on f14 as f16 has this natively
# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)"
vsys-MODULES := vsys
vsys-SPEC := vsys.spec
# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
-vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
-ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
-endif
+vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
IN_NODEIMAGE += vsys
ALL += vsys
ifneq "$(DISTRONAME)" "f16"
mod_python-MODULES := mod_python
mod_python-SPEC := mod_python.spec
-mod_python-DEVEL-RPMS := httpd-devel
+mod_python-STOCK-DEVEL-RPMS := httpd-devel
mod_python-BUILD-FROM-SRPM := yes
ALL += mod_python
endif
#
#monitor-MODULES := monitor
#monitor-SPEC := Monitor.spec
-#monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+#monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel
#ALL += monitor
#IN_NODEIMAGE += monitor
#
rvm-ruby-MODULES := rvm-ruby
rvm-ruby-SPEC := rpm/rvm-ruby.spec
-rvm-ruby-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
-ALL += rvm-ruby
+rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
+# Since Oct 22. 2013, f18 has a new release of openssl that ruby is not too happy to build against
+# turning this off for now, Christoph Dwertmann to monitor the status of this bug/incompatibility upstream
+#ALL += rvm-ruby
#
# OML measurement library
#
oml-MODULES := oml
-oml-DEVEL-RPMS += sqlite-devel
+oml-STOCK-DEVEL-RPMS += sqlite-devel
oml-SPEC := liboml.spec
ALL += oml
sfa-SPEC := sfa.spec
ALL += sfa
-sface-MODULES := sface
-sface-SPEC := sface.spec
-ALL += sface
+#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
+myslice-STOCK-DEVEL-RPMS := python-django
+myslice-STOCK-DEVEL-DEBS := python-django python-django-south
#ALL += myslice
manifold-MODULES := manifold