+# $Id$
+# $URL$
#
# declare the packages to be built and their dependencies
# initial version from Mark Huang
# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
-# $Id$
-#
# see doc in Makefile
#
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
+libnl-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
ALL += libnl
IN_BOOTSTRAPFS += libnl
endif
#
# NodeUpdate
#
-nodeupdate-MODULES := NodeUpdate
+nodeupdate-MODULES := nodeupdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
IN_BOOTSTRAPFS += nodeupdate
#
# NodeManager
#
-nodemanager-MODULES := NodeManager
+nodemanager-MODULES := nodemanager
nodemanager-SPEC := NodeManager.spec
ALL += nodemanager
IN_BOOTSTRAPFS += nodemanager
#
# codemux: Port 80 demux
#
-codemux-MODULES := CoDemux
+codemux-MODULES := codemux
codemux-SPEC := codemux.spec
codemux-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += codemux
ALL += fprobe-ulog
IN_BOOTSTRAPFS += fprobe-ulog
+#
+# DistributedRateLimiting
+#
+DistributedRateLimiting-MODULES := DistributedRateLimiting
+DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+ALL += DistributedRateLimiting
+IN_NODEREPO += DistributedRateLimiting
+
#
# pf2slice
#
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS := kernel-devel
+iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
ALL += iptables
IN_BOOTSTRAPFS += iptables
IN_BOOTSTRAPFS += vsys
ALL += vsys
+#
+# vsys-scripts
+#
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := vsys-scripts.spec
+IN_BOOTSTRAPFS += vsys-scripts
+ALL += vsys-scripts
+
#
# PLCAPI
#
-PLCAPI-MODULES := PLCAPI
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
-IN_MYPLC += PLCAPI
+plcapi-MODULES := plcapi
+plcapi-SPEC := PLCAPI.spec
+ALL += plcapi
+IN_MYPLC += plcapi
+
+#
+# drupal
+#
+drupal-MODULES := drupal
+drupal-SPEC := drupal.spec
+drupal-BUILD-FROM-SRPM := yes
+ALL += drupal
+IN_MYPLC += drupal
+
+#
+# use the plewww module instead
+#
+plewww-MODULES := plewww
+plewww-SPEC := plewww.spec
+ALL += plewww
+IN_MYPLC += plewww
+
+#
+# www-register-wizard
+#
+www-register-wizard-MODULES := www-register-wizard
+www-register-wizard-SPEC := www-register-wizard.spec
+ALL += www-register-wizard
+IN_MYPLC += www-register-wizard
#
-# PLCWWW
+# pcucontrol
#
-PLCWWW-MODULES := PLCWWW
-PLCWWW-SPEC := PLCWWW.spec
-ALL += PLCWWW
-IN_MYPLC += PLCWWW
+pcucontrol-MODULES := pcucontrol
+pcucontrol-SPEC := pcucontrol.spec
+ALL += pcucontrol
#
# monitor
IN_BOOTSTRAPFS += monitor
#
-# monitor-server
+# PLC RT
+#
+plcrt-MODULES := PLCRT
+plcrt-SPEC := plcrt.spec
+ALL += plcrt
+
+#
+# zabbix
+#
+zabbix-MODULES := Monitor
+zabbix-SPEC := zabbix.spec
+zabbix-BUILD-FROM-SRPM := yes
+ALL += zabbix
+
+#
+# pyopenssl
#
-monitor-server-MODULES := Monitor
-monitor-server-SPEC := monitor-server.spec
-ALL += monitor-server
+pyopenssl-MODULES := pyopenssl
+pyopenssl-SPEC := pyOpenSSL.spec
+pyopenssl-BUILD-FROM-SRPM := yes
+ALL += pyopenssl
+
+
+#
+# pyaspects
+#
+pyaspects-MODULES := pyaspects
+pyaspects-SPEC := pyaspects.spec
+pyaspects-BUILD-FROM-SRPM := yes
+ALL += pyaspects
+
+#
+# ejabberd
+#
+ejabberd-MODULES := ejabberd
+ejabberd-SPEC := ejabberd.spec
+ejabberd-BUILD-FROM-SRPM := yes
+ALL += ejabberd
+
+
+#
+# sfa - Slice Facility Architecture
+#
+sfa-MODULES := sfa
+sfa-SPEC := sfa.spec
+ALL += sfa
#
# nodeconfig
#
-nodeconfig-MODULES := nodeconfig build
+# xxx needed when upgrading to 5.0
+#nodeconfig-MODULES := nodeconfig
+nodeconfig-MODULES := nodeconfig
nodeconfig-SPEC := nodeconfig.spec
ALL += nodeconfig
IN_MYPLC += nodeconfig
#
# bootmanager
#
-bootmanager-MODULES := BootManager
+bootmanager-MODULES := bootmanager
bootmanager-SPEC := bootmanager.spec
ALL += bootmanager
IN_MYPLC += bootmanager
ALL += pypcilib
IN_BOOTCD += pypcilib
+#
+# pyplnet
+#
+pyplnet-MODULES := pyplnet
+pyplnet-SPEC := pyplnet.spec
+ALL += pyplnet
+IN_BOOTSTRAPFS += pyplnet
+IN_MYPLC += pyplnet
+IN_BOOTCD += pyplnet
+
+
+#
+# OMF resource controller
+#
+omf-resctl-MODULES := omf
+omf-resctl-SPEC := omf-resctl.spec
+ALL += omf-resctl
+IN_VSERVER += omf-resctl
+
+#
+# OMF exp controller
+#
+omf-expctl-MODULES := omf
+omf-expctl-SPEC := omf-expctl.spec
+ALL += omf-expctl
+
+
#
# bootcd
#
-bootcd-MODULES := BootCD build
+bootcd-MODULES := bootcd build
bootcd-SPEC := bootcd.spec
bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
#
# vserver : reference image for slices
#
-vserver-MODULES := VserverReference build
+vserver-MODULES := vserver-reference build
vserver-SPEC := vserver-reference.spec
-# Package must be built as root
-vserver-RPMBUILD := sudo bash ./rpmbuild.sh
vserver-DEPEND-PACKAGES := $(IN_VSERVER)
vserver-DEPEND-FILES := RPMS/yumgroups.xml
vserver-RPMDATE := yes
#
# bootstrapfs
#
-bootstrapfs-MODULES := BootstrapFS build
+bootstrapfs-MODULES := bootstrapfs build
bootstrapfs-SPEC := bootstrapfs.spec
bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
# noderepo
#
# all rpms resulting from packages marked as being in bootstrapfs and vserver
-NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER),$($(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 := bootstrapfs
noderepo-SPEC := noderepo.spec
noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
# package requires all regular packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
noderepo-DEPEND-FILES := RPMS/yumgroups.xml
#export rpm list to the specfile
noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
IN_MYPLC += noderepo
#
-# MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver
-#
-myplc-native-MODULES := MyPLC build
-myplc-native-SPEC := myplc-native.spec
-# Package must be built as root
-myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
-myplc-native-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
-ALL += myplc-native
-
-## #
-## # myplc : old-fashioned, chroot-based packaging
-## #
-## myplc-MODULES := MyPLC build
-## myplc-SPEC := myplc.spec
-## # Package must be built as root
-## myplc-RPMBUILD := sudo bash ./rpmbuild.sh
-## # myplc may require all packages
-## myplc-DEPEND-PACKAGES := $(IN_MYPLC)
-## myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
-## myplc-RPMDATE := yes
-## ALL += myplc
+# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
+#
+myplc-MODULES := myplc
+myplc-SPEC := myplc.spec
+myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
+ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but
# we still need to pull MyPLC, as it is where the specfile lies,
# together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := MyPLC PLCAPI NodeManager
+myplc-docs-MODULES := myplc plcapi nodemanager Monitor
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs
-myplc-release-MODULES := MyPLC
-myplc-release-SPEC := myplc-release.spec
-myplc-release-RPMDATE := yes
-ALL += myplc-release
+# using some other name than myplc-release, as this is a make target already
+release-MODULES := myplc
+release-SPEC := myplc-release.spec
+release-RPMDATE := yes
+ALL += release
+