# see doc in Makefile
#
-########## this should not be needed with f14 anymore
-#f14# #
-#f14# # boost
-#f14# #
-#f14# # we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35
-#f14# # this build is based on the f11 rpm, i.e. boost-1.37
-#f14# #
-#f14# boost-MODULES := boost
-#f14# boost-SPEC := boost.spec
-#f14# boost-BUILD-FROM-SRPM := yes
-#f14# boost-DEVEL-RPMS := bzip2-devel libicu-devel chrpath
-#f14# ALL += boost
-#f14# IN_BOOTSTRAPFS += boost
-#f14#
-#f14# #
-#f14# # gnuradio
-#f14# #
-#f14# gnuradio-MODULES := gnuradio
-#f14# gnuradio-SPEC := gnuradio.spec
-#f14# gnuradio-BUILD-FROM-SRPM := yes
-#f14# gnuradio-DEVEL-RPMS := python-numeric numpy wxPython PyQt4 swig fftw sdcc gsl guile cppunit fftw-devel gsl-devel libusb-devel cppunit-devel
-#f14# # boost-devel needs boost !
-#f14# gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel
-#f14# ALL += gnuradio
-#f14# IN_BOOTSTRAPFS += gnuradio
-
#
# bbn
#
bbn-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel swig
#bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel
ALL += bbn
-IN_BOOTSTRAPFS += bbn
+IN_NODEIMAGE += bbn
#
# crunchxml
crunchxml-BUILD-FROM-SRPM := yes
crunchxml-DEVEL-RPMS := glib2-devel libxml-devel libxml2-devel scons
ALL += crunchxml
-IN_BOOTSTRAPFS += crunchxml
+IN_NODEIMAGE += crunchxml
#
# spectools
spectools-BUILD-FROM-SRPM := yes
spectools-DEVEL-RPMS := gtk2-devel
ALL += spectools
-IN_BOOTSTRAPFS += spectools
+IN_NODEIMAGE += spectools
#
# sge
sge-DEVEL-RPMS += lesstif lesstif-devel
# turning this off - current focus is on deploying the sge box separately from myplc
-# packaging is still broken, and we're exploring a ready-t-o-use distro on centos
+# packaging is still broken, and we're exploring a ready-to-use distro on centos
# ALL += sge
-# IN_BOOTSTRAPFS += sge
+# IN_NODEIMAGE += sge
#
# kernel
ALL += $(KERNELS)
# this is to mark on which image a given rpm is supposed to go
IN_BOOTCD += $(KERNELS)
-IN_VSERVER += $(KERNELS)
-IN_BOOTSTRAPFS += $(KERNELS)
+IN_SLICEIMAGE += $(KERNELS)
+IN_NODEIMAGE += $(KERNELS)
#
# ipfw: root context module, and slice companion
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
ALL += ipfwroot
-IN_BOOTSTRAPFS += ipfwroot
+IN_NODEIMAGE += ipfwroot
ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
ALL += madwifi
-IN_BOOTSTRAPFS += madwifi
-
-### #
-### # nozomi
-### #
-### nozomi-MODULES := nozomi
-### nozomi-SPEC := nozomi.spec
-### nozomi-DEPEND-DEVEL-RPMS += kernel-devel
-### nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
-### kernel_release=$(kernel.rpm-release) \
-### kernel_arch=$(kernel.rpm-arch)
-### IN_BOOTSTRAPFS += nozomi
-### ALL += nozomi
-
-### #
-### # comgt
-### #
-### comgt-MODULES := comgt
-### comgt-SPEC := comgt.spec
-### IN_BOOTSTRAPFS += comgt
-### ALL += comgt
+IN_NODEIMAGE += madwifi
#
# umts: root context stuff
#
umts-backend-MODULES := planetlab-umts-tools
umts-backend-SPEC := backend.spec
-IN_BOOTSTRAPFS += umts-backend
+IN_NODEIMAGE += umts-backend
ALL += umts-backend
#
#
umts-frontend-MODULES := planetlab-umts-tools
umts-frontend-SPEC := frontend.spec
-IN_VSERVER += umts-frontend
+IN_SLICEIMAGE += umts-frontend
ALL += umts-frontend
#
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
+iptables-BUILD-FROM-SRPM := yes
iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
ALL += iptables
-IN_BOOTSTRAPFS += iptables
-
-#
-# iproute
-#
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
+IN_NODEIMAGE += iptables
#
# util-vserver
#
util-vserver-MODULES := util-vserver
util-vserver-SPEC := util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
+util-vserver-BUILD-FROM-SRPM := yes
+util-vserver-RPMFLAGS:= --without dietlibc --without doc
ALL += util-vserver
-IN_BOOTSTRAPFS += util-vserver
-
-#
-# libnl - local import
-# we need either 1.1 or at least 1.0.pre6
-# rebuild this on centos5 - see yumexclude
-#
-local_libnl=false
-ifeq "$(DISTRONAME)" "centos5"
-local_libnl=true
-endif
-
-ifeq "$(local_libnl)" "true"
-libnl-MODULES := libnl
-libnl-SPEC := libnl.spec
-libnl-BUILD-FROM-SRPM := yes
-# this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
-libnl-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
-ALL += libnl
-IN_BOOTSTRAPFS += libnl
-endif
+IN_NODEIMAGE += util-vserver
#
# util-vserver-pl
util-vserver-pl-MODULES := util-vserver-pl
util-vserver-pl-SPEC := util-vserver-pl.spec
util-vserver-pl-DEPEND-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core
-ifeq "$(local_libnl)" "true"
-util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
-endif
ALL += util-vserver-pl
-IN_BOOTSTRAPFS += util-vserver-pl
+IN_NODEIMAGE += util-vserver-pl
#
# NodeUpdate
nodeupdate-MODULES := nodeupdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
-IN_BOOTSTRAPFS += nodeupdate
+IN_NODEIMAGE += nodeupdate
#
# ipod
ipod-MODULES := PingOfDeath
ipod-SPEC := ipod.spec
ALL += ipod
-IN_BOOTSTRAPFS += ipod
+IN_NODEIMAGE += ipod
#
# NodeManager
nodemanager-MODULES := nodemanager
nodemanager-SPEC := NodeManager.spec
ALL += nodemanager
-IN_BOOTSTRAPFS += nodemanager
+IN_NODEIMAGE += nodemanager
#
# pl_sshd
sshd-MODULES := pl_sshd
sshd-SPEC := pl_sshd.spec
ALL += sshd
-IN_BOOTSTRAPFS += sshd
+IN_NODEIMAGE += sshd
#
# codemux: Port 80 demux
codemux-MODULES := codemux
codemux-SPEC := codemux.spec
ALL += codemux
-IN_BOOTSTRAPFS += codemux
+IN_NODEIMAGE += codemux
#
# fprobe-ulog
fprobe-ulog-MODULES := fprobe-ulog
fprobe-ulog-SPEC := fprobe-ulog.spec
ALL += fprobe-ulog
-IN_BOOTSTRAPFS += fprobe-ulog
-
-### #
-### # DistributedRateLimiting
-### #
-### DistributedRateLimiting-MODULES := DistributedRateLimiting
-### DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
-### ALL += DistributedRateLimiting
-### IN_NODEREPO += DistributedRateLimiting
-
+IN_NODEIMAGE += fprobe-ulog
#
# pf2slice
mom-MODULES := Mom
mom-SPEC := pl_mom.spec
ALL += mom
-IN_BOOTSTRAPFS += 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 "$(local_inotify_tools)" "true"
-inotify-tools-MODULES := inotify-tools
-inotify-tools-SPEC := inotify-tools.spec
-inotify-tools-BUILD-FROM-SRPM := yes
-IN_BOOTSTRAPFS += inotify-tools
-ALL += inotify-tools
-endif
-
-### #
-### # openvswitch
-### #
-### openvswitch-MODULES := openvswitch
-### openvswitch-SPEC := openvswitch.spec
-### openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-### IN_BOOTSTRAPFS += openvswitch
-### ALL += openvswitch
+IN_NODEIMAGE += mom
#
# vsys
#
vsys-MODULES := vsys
vsys-SPEC := vsys.spec
-vsys-DEVEL-RPMS += ocaml-ocamldoc
-ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
-endif
-IN_BOOTSTRAPFS += vsys
+vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
+IN_NODEIMAGE += vsys
ALL += vsys
#
#
vsys-scripts-MODULES := vsys-scripts
vsys-scripts-SPEC := vsys-scripts.spec
-IN_BOOTSTRAPFS += vsys-scripts
+IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
#
pcucontrol-SPEC := pcucontrol.spec
ALL += pcucontrol
-#
-# monitor
-#
-monitor-MODULES := Monitor
-monitor-SPEC := Monitor.spec
-monitor-DEVEL-RPMS += net-snmp net-snmp-devel
-ALL += monitor
-IN_BOOTSTRAPFS += monitor
-
-### #
-### # zabbix
-### #
-### zabbix-MODULES := Monitor
-### zabbix-SPEC := zabbix.spec
-### zabbix-BUILD-FROM-SRPM := yes
-### zabbix-DEVEL-RPMS += python-cherrypy
-### ALL += zabbix
-###
-### #
-### # PLC RT
-### #
-### plcrt-MODULES := PLCRT
-### plcrt-SPEC := plcrt.spec
-### ALL += plcrt
-
#
# pyopenssl
#
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__
-### build_sfa=true
-### ifeq "$(DISTRONAME)" "centos5"
-### build_sfa=false
-### endif
-
-### ifeq "$(build_sfa)" "true"
-### #
-### # sfa - Slice Facility Architecture
-### #
-### sfa-MODULES := sfa
-### sfa-SPEC := sfa.spec
-### ALL += sfa
-### endif
-
-### sface-MODULES := sface
-### sface-SPEC := sface.spec
-### ALL += sface
-
#
# nodeconfig
#
pyplnet-MODULES := pyplnet
pyplnet-SPEC := pyplnet.spec
ALL += pyplnet
-IN_BOOTSTRAPFS += pyplnet
+IN_NODEIMAGE += pyplnet
IN_MYPLC += pyplnet
IN_BOOTCD += pyplnet
omf-resctl-MODULES := omf
omf-resctl-SPEC := omf-resctl.spec
ALL += omf-resctl
-IN_VSERVER += omf-resctl
+IN_SLICEIMAGE += omf-resctl
#
# OMF exp controller
IN_MYPLC += bootcd
#
-# vserver : reference image for slices
+# images for slices
#
-vserver-MODULES := vserver-reference build
-vserver-SPEC := vserver-reference.spec
-vserver-DEPEND-PACKAGES := $(IN_VSERVER)
-vserver-DEPEND-FILES := RPMS/yumgroups.xml
-vserver-RPMDATE := yes
-ALL += vserver
-IN_BOOTSTRAPFS += vserver
+sliceimage-MODULES := sliceimage build
+sliceimage-SPEC := sliceimage.spec
+sliceimage-DEPEND-PACKAGES := $(IN_SLICEIMAGE)
+sliceimage-DEPEND-FILES := RPMS/yumgroups.xml
+sliceimage-RPMDATE := yes
+ALL += sliceimage
+IN_NODEIMAGE += sliceimage
+
+#
+# vserver-specific sliceimage initialization
+#
+vserver-sliceimage-MODULES := sliceimage
+vserver-sliceimage-SPEC := vserver-sliceimage.spec
+vserver-sliceimage-RPMDATE := yes
+ALL += vserver-sliceimage
+IN_NODEIMAGE += vserver-sliceimage
#
-# bootstrapfs
+# nodeimage
#
-bootstrapfs-MODULES := bootstrapfs build
-bootstrapfs-SPEC := bootstrapfs.spec
-bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
-bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
-bootstrapfs-RPMDATE := yes
-ALL += bootstrapfs
-IN_MYPLC += bootstrapfs
+nodeimage-MODULES := nodeimage build
+nodeimage-SPEC := nodeimage.spec
+nodeimage-DEPEND-PACKAGES := $(IN_NODEIMAGE)
+nodeimage-DEPEND-FILES := RPMS/yumgroups.xml
+nodeimage-RPMDATE := yes
+ALL += nodeimage
+IN_MYPLC += nodeimage
#
# noderepo
#
-# all rpms resulting from packages marked as being in bootstrapfs and vserver
-NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER),$($(package).rpms))
+# all rpms resulting from packages marked as being in nodeimage and sliceimage
+NODEREPO_RPMS = $(foreach package,$(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE),$($(package).rpms))
# replace space with +++ (specvars cannot deal with spaces)
SPACE=$(subst x, ,x)
NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
-noderepo-MODULES := bootstrapfs
+noderepo-MODULES := nodeimage
noderepo-SPEC := noderepo.spec
# package requires all embedded packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
+noderepo-DEPEND-PACKAGES := $(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE)
noderepo-DEPEND-FILES := RPMS/yumgroups.xml
#export rpm list to the specfile
noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
# slicerepo
#
# all rpms resulting from packages marked as being in vserver
-SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms))
+SLICEREPO_RPMS = $(foreach package,$(IN_SLICEIMAGE),$($(package).rpms))
# replace space with +++ (specvars cannot deal with spaces)
SPACE=$(subst x, ,x)
SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
-slicerepo-MODULES := bootstrapfs
+slicerepo-MODULES := nodeimage
slicerepo-SPEC := slicerepo.spec
# package requires all embedded packages
-slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
+slicerepo-DEPEND-PACKAGES := $(IN_SLICEIMAGE)
slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
#export rpm list to the specfile
slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)