mkinitrd-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel
ALL += mkinitrd
IN_BOOTCD += mkinitrd
-IN_VSERVER += mkinitrd
-IN_BOOTSTRAPFS += mkinitrd
+IN_SLICEIMAGE += mkinitrd
+IN_NODEIMAGE += mkinitrd
IN_MYPLC += mkinitrd
endif
endif
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)
#
# madwifi
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
ALL += madwifi
-IN_BOOTSTRAPFS += madwifi
+IN_NODEIMAGE += madwifi
endif
endif
iptables-BUILD-FROM-SRPM := yes
iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
ALL += iptables
-IN_BOOTSTRAPFS += iptables
+IN_NODEIMAGE += iptables
#
# iproute
iproute-SPEC := iproute.spec
iproute-BUILD-FROM-SRPM := yes
ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
+IN_NODEIMAGE += iproute
+IN_SLICEIMAGE += iproute
IN_BOOTCD += iproute
#
util-vserver-BUILD-FROM-SRPM := yes
util-vserver-RPMFLAGS:= --without dietlibc --without doc
ALL += util-vserver
-IN_BOOTSTRAPFS += util-vserver
+IN_NODEIMAGE += util-vserver
#
# libnl - local import
# 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
+IN_NODEIMAGE += libnl
endif
#
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
+IN_NODEIMAGE += fprobe-ulog
#
# DistributedRateLimiting
mom-MODULES := Mom
mom-SPEC := pl_mom.spec
ALL += mom
-IN_BOOTSTRAPFS += mom
+IN_NODEIMAGE += mom
#
# inotify-tools - local import
inotify-tools-MODULES := inotify-tools
inotify-tools-SPEC := inotify-tools.spec
inotify-tools-BUILD-FROM-SRPM := yes
-IN_BOOTSTRAPFS += inotify-tools
+IN_NODEIMAGE += inotify-tools
ALL += inotify-tools
endif
openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
-IN_BOOTSTRAPFS += openvswitch
+IN_NODEIMAGE += openvswitch
ALL += openvswitch
endif
ifeq "$(local_inotify_tools)" "true"
vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
endif
-IN_BOOTSTRAPFS += vsys
+IN_NODEIMAGE += vsys
ALL += vsys
#
#
vsyssh-MODULES := vsys
vsyssh-SPEC := vsyssh.spec
-IN_SLIVER += vsyssh
+IN_SLICEIMAGE += vsyssh
ALL += vsyssh
#
#
vsys-scripts-MODULES := vsys-scripts
vsys-scripts-SPEC := vsys-scripts.spec
-IN_BOOTSTRAPFS += vsys-scripts
+IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
#
monitor-SPEC := Monitor.spec
monitor-DEVEL-RPMS += net-snmp net-snmp-devel
ALL += monitor
-IN_BOOTSTRAPFS += monitor
+IN_NODEIMAGE += monitor
#
# PLC RT
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
-ifeq "$(DISTRONAME)" "centos5"
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
build_sfa=false
endif
sfa-MODULES := sfa
sfa-SPEC := sfa.spec
ALL += sfa
-endif
sface-MODULES := sface
sface-SPEC := sface.spec
ALL += sface
+endif
#
# 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)