ALL += $(KERNELS)
# this is to mark on which image a given rpm is supposed to go
IN_BOOTCD += $(KERNELS)
-IN_SLICEIMAGE += $(KERNELS)
+#IN_SLICEIMAGE += $(KERNELS)
IN_NODEIMAGE += $(KERNELS)
#
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
-ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
- kernel_release=$(kernel.rpm-release) \
- kernel_arch=$(kernel.rpm-arch)
ALL += ipfwslice
#
IN_NODEIMAGE += ipod
#
-# NodeManager
+# plnode-utils
+#
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-vs.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
+#
+# nodemanager
#
-nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_NODEIMAGE += nodemanager
+nodemanager-lib-MODULES := nodemanager
+nodemanager-lib-SPEC := nodemanager-lib.spec
+ALL += nodemanager-lib
+IN_NODEIMAGE += nodemanager-lib
+
+nodemanager-vs-MODULES := nodemanager
+nodemanager-vs-SPEC := nodemanager-vs.spec
+ALL += nodemanager-vs
+IN_NODEIMAGE += nodemanager-vs
#
# pl_sshd
#
# PlanetLab Mom: Cleans up your mess
#
-mom-MODULES := Mom
+mom-MODULES := mom
mom-SPEC := pl_mom.spec
ALL += mom
IN_NODEIMAGE += mom
ALL += inotify-tools
endif
-#
-# openvswitch
-#
-openvswitch-MODULES := openvswitch
-openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-# maybe not in production yet
-#IN_NODEIMAGE += openvswitch
-ALL += openvswitch
+# #
+# # openvswitch
+# #
+# openvswitch-MODULES := openvswitch
+# openvswitch-SPEC := openvswitch.spec
+# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+#
+# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
+# IN_NODEIMAGE += openvswitch
+# ALL += openvswitch
+# endif
#
# vsys
# vsys-scripts
#
vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
+vsys-wrapper-MODULES := vsys-scripts
+vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
+IN_SLICEIMAGE += vsys-wrapper
+ALL += vsys-wrapper
+
+# openvswitch requires an autoconf more recent than what f12 has
+ifeq "$(DISTRONAME)" "f12"
+autoconf-MODULES := autoconf
+autoconf-SPEC := autoconf.spec
+autoconf-BUILD-FROM-SRPM := yes
+ALL += autoconf
+endif
+
+sliver-openvswitch-MODULES := sliver-openvswitch
+sliver-openvswitch-SPEC := sliver-openvswitch.spec
+ifeq "$(DISTRONAME)" "f12"
+sliver-openvswitch-DEPEND-DEVEL-RPMS-UPDATES := autoconf
+endif
+IN_SLICEIMAGE += sliver-openvswitch
+ALL += sliver-openvswitch
+
#
# plcapi
#
pyaspects-BUILD-FROM-SRPM := yes
ALL += pyaspects
-#
-# ejabberd
-#
-ejabberd-MODULES := ejabberd
-ejabberd-SPEC := ejabberd.spec
-ejabberd-BUILD-FROM-SRPM := yes
-ejabberd-DEVEL-RPMS += erlang pam-devel hevea
-# not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
-# so, this is relevant on f8 and centos5 only
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
-ALL += ejabberd
-endif
-
# 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