X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=572acf3e098e2b26215ad01e77d34993bd330ef7;hb=28a215ada93162dc79aac9c41bd977206296a771;hp=2971490fd363ef24fb578a53269f8141eab38627;hpb=d72d2c5a93c08873f7482e0704f62bf3f7292871;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 2971490f..572acf3e 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -1,456 +1,599 @@
 #
-# PlanetLab standard components list
-#
+# declare the packages to be built and their dependencies
+# initial version from Mark Huang
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
+# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
-# $Id: onelab.mk,v 1.22 2007/04/16 13:59:29 thierry Exp $
+# see doc in Makefile  
 #
 
 #
-# Required:
-#
-# CVSROOT or package-CVSROOT: CVSROOT to use
-# TAG or package-TAG: CVS tag to use
-# package-MODULE: CVS module name to use
-# package-SPEC: RPM spec file template
-#
-# Optional:
-#
-# package-RPMFLAGS: Miscellaneous RPM flags
-# package-RPMBUILD: If not rpmbuild
-# package-CVS_RSH: If not ssh
+# kernel
 #
-# Add to ALL if you want the package built as part of the default set.
+# use a package name with srpm in it:
+# so the source rpm is created by running make srpm in the codebase
 #
 
-####
-# we do not use TAG directly anymore, and let it to HEAD
-# this because we want the rpm's releases to reflect the date even when a tag is used
-# our build script defines COMMON_TAG that the various components are free to use or not
- 
-# COMMON_TAG set from the build script
+kernel-MODULES := linux-2.6
+kernel-SPEC := kernel-2.6.spec
+kernel-BUILD-FROM-SRPM := yes
+ifeq "$(HOSTARCH)" "i386"
+kernel-RPMFLAGS:= --target i686
+else
+kernel-RPMFLAGS:= --target $(HOSTARCH)
+endif
+kernel-SPECVARS += kernelconfig=planetlab
+KERNELS += kernel
 
-TAGSFILE = onelab-tags.mk
+kernels: $(KERNELS)
+kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 
-include $(TAGSFILE)
+ALL += $(KERNELS)
+# this is to mark on which image a given rpm is supposed to go
+IN_BOOTCD += $(KERNELS)
+#IN_SLICEIMAGE += $(KERNELS)
+IN_NODEIMAGE += $(KERNELS)
 
 #
-# Default values
+# ipfw: root context module, and slice companion
 #
+ipfwroot-MODULES := ipfw
+ipfwroot-SPEC := planetlab/ipfwroot.spec
+ipfwroot-DEPEND-DEVEL-RPMS += kernel-devel
+ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
+        kernel_release=$(kernel.rpm-release) \
+        kernel_arch=$(kernel.rpm-arch)
+ALL += ipfwroot
+IN_NODEIMAGE += ipfwroot
 
-# it's useless to set this here because it's overriden on the command line by nightly-build.sh
-TAG := HEAD
+ipfwslice-MODULES := ipfw
+ipfwslice-SPEC := planetlab/ipfwslice.spec
+ALL += ipfwslice
 
-# Check if a tag has been checked out
-ifneq ($(wildcard CVS/Root),)
-# Check if we are able to access CVS
-CVSTAG := $(shell cvs status planetlab.mk 2>/dev/null | sed -ne 's/[[:space:]]*Sticky Tag:[[:space:]]*\([^[:space:]]*\).*/\1/p')
-ifneq ($(CVSTAG),)
-CVSROOT := $(shell cat CVS/Root)
-ifeq ($(CVSTAG),(none))
-TAG := HEAD
-else
-TAG := $(CVSTAG)
-endif
+#
+# madwifi
+#
+# skip this with k32/f8
+ifneq "" "$(findstring k32,$(PLDISTROTAGS))"
+ifneq "$(DISTRONAME)" "f8"
+madwifi-MODULES := madwifi
+madwifi-SPEC := madwifi.spec
+madwifi-BUILD-FROM-SRPM := yes
+madwifi-DEPEND-DEVEL-RPMS += kernel-devel
+madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+	kernel_release=$(kernel.rpm-release) \
+	kernel_arch=$(kernel.rpm-arch)
+ALL += madwifi
+IN_NODEIMAGE += madwifi
 endif
 endif
 
 #
-# kernel
-#
-
-#kernel-x86_64-MODULE := linux-2.6
-#kernel-x86_64-RPMFLAGS:= --target x86_64
-#kernel-x86_64-SPEC := linux-2.6/scripts/kernel-2.6-$(PLDISTRO).spec
-##ALL += kernel-x86_64
-
-kernel-i686-MODULE := linux-2.6
-kernel-i686-RPMFLAGS:= --target i686
-kernel-i686-SPEC := linux-2.6/scripts/kernel-2.6-$(PLDISTRO).spec
-ALL += kernel-i686
-
-#kernel-i586-MODULE := linux-2.6
-#kernel-i586-RPMFLAGS:= --target i586
-#kernel-i586-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
-#ALL += kernel-i586
-
-#kernel: kernel-i586 kernel-i686
-#kernel-clean: kernel-i586-clean kernel-i686-clean
-kernel: kernel-i686
-kernel-clean: kernel-i686-clean
+# comgt
+# 
+comgt-MODULES := comgt
+comgt-SPEC := comgt.spec
+IN_NODEIMAGE += comgt
+ALL += comgt
 
 #
-# vnet
+# umts: root context stuff
 #
-
-vnet-MODULE := vnet
-vnet-SPEC := vnet/vnet.spec
-ALL += vnet
-
-# Build kernel first so we can bootstrap off of its build
-vnet: kernel
+umts-backend-MODULES := planetlab-umts-tools
+umts-backend-SPEC := backend.spec
+IN_NODEIMAGE += umts-backend
+ALL += umts-backend
 
 #
-# madwifi
+# umts: slice tools
 #
-
-madwifi-ng-MODULE := madwifi-ng
-madwifi-ng-SPEC := madwifi-ng/madwifi.spec
-ALL += madwifi-ng
-
-# Build kernel first so we can bootstrap off of its build
-madwifi-ng: kernel
-
-# 
-# wireless-tools
-# 
-
-wireless-tools-MODULE = wireless-tools
-wireless-tools-SPEC := wireless-tools.spec
-ALL += wireless-tools
+umts-frontend-MODULES := planetlab-umts-tools
+umts-frontend-SPEC := frontend.spec
+IN_SLICEIMAGE += umts-frontend
+ALL += umts-frontend
 
 #
-# ivtv 
+# iptables
 #
-
-#ivtv-MODULE := ivtv
-#ivtv-SPEC := ivtv/ivtv.spec
-#ALL += ivtv
+iptables-MODULES := iptables
+iptables-SPEC := iptables.spec
+iptables-BUILD-FROM-SRPM := yes	
+iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+ALL += iptables
+IN_NODEIMAGE += iptables
+
+###
+# we use the stock iproute2 with 2.6.32, since our gre patch is not needed anymore with that kernel
+# note that this should be consistently reflected in nodeyumexclude
+# #
+# # iproute
+# #
+# iproute-MODULES := iproute2
+# iproute-SPEC := iproute.spec
+# iproute-BUILD-FROM-SRPM := yes	
+# ALL += iproute
+# IN_NODEIMAGE += iproute
+# IN_SLICEIMAGE += iproute
+# IN_BOOTCD += iproute
 
 #
 # util-vserver
 #
-
-util-vserver-MODULE := util-vserver
-util-vserver-SPEC := util-vserver/util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
+util-vserver-MODULES := util-vserver
+util-vserver-SPEC := util-vserver.spec
+# starting with 0.4
+util-vserver-BUILD-FROM-SRPM := yes
+util-vserver-RPMFLAGS:= --without dietlibc --without doc
 ALL += util-vserver
+IN_NODEIMAGE += util-vserver
 
 #
-# PlanetLabAccounts
+# 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
 
-PlanetLabAccounts-MODULE := PlanetLabAccounts
-PlanetLabAccounts-SPEC := PlanetLabAccounts/PlanetLabAccounts.spec
-ALL += PlanetLabAccounts
+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_NODEIMAGE += libnl
+endif
 
 #
-# NodeUpdate
+# util-vserver-pl
 #
-
-NodeUpdate-MODULE := NodeUpdate
-NodeUpdate-SPEC := NodeUpdate/NodeUpdate.spec
-ALL += NodeUpdate
+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_NODEIMAGE += util-vserver-pl
 
 #
-# PlanetLabConf
+# NodeUpdate
 #
-
-PlanetLabConf-MODULE := PlanetLabConf
-PlanetLabConf-SPEC := PlanetLabConf/PlanetLabConf.spec
-ALL += PlanetLabConf
+nodeupdate-MODULES := nodeupdate
+nodeupdate-SPEC := NodeUpdate.spec
+ALL += nodeupdate
+IN_NODEIMAGE += nodeupdate
 
 #
 # ipod
 #
-
-ipod-MODULE := ipod
-ipod-SPEC := ipod/ipod.spec
+ipod-MODULES := PingOfDeath
+ipod-SPEC := ipod.spec
 ALL += ipod
+IN_NODEIMAGE += ipod
 
 #
-# sudo
-#
-
-sudo-MODULE := sudo
-sudo-SPEC := sudo/planetlab_sudo.spec
-ALL += sudo
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-vs.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
 
 #
-# pycurl
+# nodemanager
 #
+nodemanager-lib-MODULES := nodemanager
+nodemanager-lib-SPEC := nodemanager-lib.spec
+ALL += nodemanager-lib
+IN_NODEIMAGE += nodemanager-lib
 
-pycurl-MODULE := pycurl
-pycurl-SPEC := pycurl/pycurl.spec
-ALL += pycurl
+nodemanager-vs-MODULES := nodemanager
+nodemanager-vs-SPEC := nodemanager-vs.spec
+ALL += nodemanager-vs
+IN_NODEIMAGE += nodemanager-vs
 
 #
-# BootServerRequest
+# pl_sshd
 #
-
-BootServerRequest-MODULE := BootServerRequest
-BootServerRequest-SPEC := BootServerRequest/PLBootServerRequest.spec
-ALL += BootServerRequest
+sshd-MODULES := pl_sshd
+sshd-SPEC := pl_sshd.spec
+ALL += sshd
+IN_NODEIMAGE += sshd
 
 #
-# PlanetLabID
+# codemux: Port 80 demux
 #
-
-PlanetLabID-MODULE := PlanetLabID
-PlanetLabID-SPEC := PlanetLabID/PlanetLabID.spec
-ALL += PlanetLabID
+codemux-MODULES := codemux
+codemux-SPEC   := codemux.spec
+ALL += codemux
+IN_NODEIMAGE += codemux
 
 #
-# Node Manager
+# fprobe-ulog
 #
-
-NodeManager-MODULE := NodeManager
-NodeManager-SPEC := NodeManager/NodeManager.spec
-ALL += NodeManager
+fprobe-ulog-MODULES := fprobe-ulog
+fprobe-ulog-SPEC := fprobe-ulog.spec
+ALL += fprobe-ulog
+IN_NODEIMAGE += fprobe-ulog
 
 #
-# pl_sshd
+# DistributedRateLimiting
 #
-
-pl_sshd-MODULE := pl_sshd
-pl_sshd-SPEC := pl_sshd/pl_sshd.spec
-ALL += pl_sshd
+# on f16 somehow configure screws up and defines LDFLAGS=-Wl,-z,relro which ld does not like..
+ifneq "$(DISTRONAME)" "f16"
+DistributedRateLimiting-MODULES := DistributedRateLimiting
+DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+ALL += DistributedRateLimiting
+IN_NODEREPO += DistributedRateLimiting
+endif
 
 #
-# libhttpd++: 
+# pf2slice
 #
+pf2slice-MODULES := pf2slice
+pf2slice-SPEC := pf2slice.spec
+ALL += pf2slice
 
-libhttpd++-MODULE := libhttpd++
-libhttpd++-SPEC := libhttpd++/libhttpd++.spec
-ALL += libhttpd++
+#
+# PlanetLab Mom: Cleans up your mess
+#
+mom-MODULES := mom
+mom-SPEC := pl_mom.spec
+ALL += mom
+IN_NODEIMAGE += mom
 
 #
-# Proper: Privileged Operations Service
+# inotify-tools - local import
+# rebuild this on centos5 (not found) - see yumexclude
 #
+local_inotify_tools=false
+ifeq "$(DISTRONAME)" "centos5"
+local_inotify_tools=true
+endif
 
-proper-MODULE := proper
-proper-SPEC := proper/proper.spec
-ALL += proper
+ifeq "$(DISTRONAME)" "sl6"
+local_inotify_tools=true
+endif
 
-proper: libhttpd++
+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
+# 
+# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
+# IN_NODEIMAGE += openvswitch
+# ALL += openvswitch
+# endif
 
 #
-# MySQL
+# vsys
 #
-
-mysql-MODULE := mysql
-mysql-SPEC := mysql/mysql.spec
-ALL += mysql
+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
+IN_NODEIMAGE += vsys
+ALL += vsys
 
 #
-# ulogd
+# vsyssh : installed in slivers
 #
-
-ulogd-MODULE := ulogd
-ulogd-SPEC := ulogd/ulogd.spec
-ALL += ulogd
-
-ulogd: kernel proper mysql
+vsyssh-MODULES := vsys
+vsyssh-SPEC := vsyssh.spec
+IN_SLICEIMAGE += vsyssh
+ALL += vsyssh
 
 #
-# netflow
+# vsys-scripts
 #
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
+IN_NODEIMAGE += vsys-scripts
+ALL += vsys-scripts
 
-netflow-MODULE := netflow
-netflow-SPEC := netflow/netflow.spec
-ALL += netflow
+vsys-wrapper-MODULES := vsys-scripts
+vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
+IN_SLICEIMAGE += vsys-wrapper
+ALL += vsys-wrapper
 
-netflow: mysql
+# 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
 
 #
-# PlanetLab Mom: Cleans up your mess
+# bind_public
 #
-
-pl_mom-MODULE := pl_mom
-pl_mom-SPEC := pl_mom/pl_mom.spec
-ALL += pl_mom
+bind_public-MODULES := bind_public
+bind_public-SPEC := bind_public.spec
+IN_SLICEIMAGE += bind_public
+ALL += bind_public
 
 #
-# iptables
+# sliver-openvswitch
 #
-
-iptables-MODULE := iptables
-iptables-SPEC := iptables/iptables.spec
-ALL += iptables
-
-iptables: kernel
+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
 
 #
-# iproute
+# plcapi
 #
+plcapi-MODULES := plcapi
+plcapi-SPEC := plcapi.spec
+ALL += plcapi
+IN_MYPLC += plcapi
 
-iproute-MODULE := iproute2
-iproute-SPEC := iproute2/iproute.spec
-ALL += iproute
+#
+# drupal
+# 
+drupal-MODULES := drupal
+drupal-SPEC := drupal.spec
+drupal-BUILD-FROM-SRPM := yes
+ALL += drupal
+IN_MYPLC += drupal
 
 #
-# kexec-tools
+# use the plewww module instead
 #
-
-kexec-tools-MODULE := kexec-tools
-kexec-tools-SPEC := kexec-tools/kexec-tools.spec
-ALL += kexec-tools
+plewww-MODULES := plewww
+plewww-SPEC := plewww.spec
+ALL += plewww
+IN_MYPLC += plewww
 
 #
-# util-python
+# 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
 
-util-python-MODULE := util-python
-util-python-SPEC := util-python/util-python.spec
-ALL += util-python
-
-# proper and util-vserver both use scripts in util-python for building
-proper: util-python
-util-vserver: util-python
-PlanetLabAuth: util-python
+#
+# pcucontrol
+#
+pcucontrol-MODULES := pcucontrol
+pcucontrol-SPEC := pcucontrol.spec
+ALL += pcucontrol
 
 #
-# PLCAPI
+# monitor
 #
+monitor-MODULES := monitor
+monitor-SPEC := Monitor.spec
+monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+ALL += monitor
+IN_NODEIMAGE += monitor
 
-PLCAPI-MODULE := new_plc_api
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
+#
+# PLC RT
+#
+plcrt-MODULES := PLCRT
+plcrt-SPEC := plcrt.spec
+ALL += plcrt
 
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 #
-# vserver-reference
+# pyopenssl
 #
+pyopenssl-MODULES := pyopenssl
+pyopenssl-SPEC := pyOpenSSL.spec
+pyopenssl-BUILD-FROM-SRPM := yes
+ALL += pyopenssl
+endif
 
-vserver-reference-MODULE := vserver-reference build
-vserver-reference-SPEC := vserver-reference/vserver-reference.spec
-# Package must be built as root
-vserver-reference-RPMBUILD := sudo rpmbuild
-ALL += vserver-reference
+#
+# pyaspects
+#
+pyaspects-MODULES := pyaspects
+pyaspects-SPEC := pyaspects.spec
+pyaspects-BUILD-FROM-SRPM := yes
+ALL += pyaspects
 
-# vserver-reference may require current packages
-vserver-reference: $(filter-out vserver-reference,$(ALL))
+#
+# nodeconfig
+#
+nodeconfig-MODULES := nodeconfig
+nodeconfig-SPEC := nodeconfig.spec
+ALL += nodeconfig
+IN_MYPLC += nodeconfig
 
 #
 # bootmanager
 #
-
-bootmanager-MODULE := bootmanager build
+bootmanager-MODULES := bootmanager
 bootmanager-SPEC := bootmanager.spec
-bootmanager-RPMBUILD := sudo rpmbuild
 ALL += bootmanager
+IN_MYPLC += bootmanager
 
-# bootmanager requires current packages
-bootmanager: $(filter-out bootmanager,$(ALL))
-
-# ...and the yum manifest
-bootmanager: RPMS/yumgroups.xml
+#
+# pypcilib : used in bootcd
+# 
+pypcilib-MODULES := pypcilib
+pypcilib-SPEC := pypcilib.spec
+ALL += pypcilib
+IN_BOOTCD += pypcilib
 
 #
-# bootcd
+# pyplnet
 #
+pyplnet-MODULES := pyplnet
+pyplnet-SPEC := pyplnet.spec
+ALL += pyplnet
+IN_NODEIMAGE += pyplnet
+IN_MYPLC += pyplnet
+IN_BOOTCD += pyplnet
 
-bootcd-MODULE := bootcd build bootmanager
-bootcd-SPEC := bootcd.spec
-bootcd-RPMBUILD := sudo rpmbuild
-ALL += bootcd
-
-# bootcd requires current packages
-bootcd: $(filter-out bootcd,$(ALL))
+#
+# for OMF resource controller as  a gem : rvm-ruby has right version of ruby and related gem stuff
+#
+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
 
 #
-# plcwww
+# OML measurement library
 #
+oml-MODULES := oml
+oml-DEVEL-RPMS += sqlite-devel 
+oml-SPEC := liboml.spec
+ALL += oml
 
-plcwww-MODULE := new_plc_www
-plcwww-SPEC := plcwww.spec
-ALL += plcwww
+#
+# bootcd
+#
+bootcd-MODULES := bootcd build
+bootcd-SPEC := bootcd.spec
+bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
+bootcd-DEPEND-FILES := RPMS/yumgroups.xml
+bootcd-RPMDATE := yes
+ALL += bootcd
+IN_MYPLC += bootcd
 
 #
-# MyPLC
+# images for slices
 #
+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
 
-myplc-MODULE := build myplc plc/scripts
+#
+# 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
+
+#
+# nodeimage
+#
+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 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 := nodeimage
+noderepo-SPEC := noderepo.spec
+# package requires all embedded packages
+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)
+noderepo-RPMDATE := yes
+ALL += noderepo
+IN_MYPLC += noderepo
+
+#
+# slicerepo
+#
+# all rpms resulting from packages marked as being in vserver
+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 := nodeimage
+slicerepo-SPEC := slicerepo.spec
+# package requires all embedded packages
+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)
+slicerepo-RPMDATE := yes
+ALL += slicerepo
+
+#
+# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
+#
+myplc-MODULES := myplc
 myplc-SPEC := myplc.spec
-# Package must be built as root
-myplc-RPMBUILD := sudo rpmbuild
+myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc
 
-# MyPLC may require current packages
-myplc: $(filter-out myplc,$(ALL))
-
-# ...and the yum manifest
-myplc: RPMS/yumgroups.xml
-
-# we also ship various information on the build in /etc/myplc-release
-myplc: SOURCES/myplc/myplc/myplc-release
-
-SOURCES/myplc/myplc/myplc-release: 
-	@echo 'Creating myplc-release'
-	mkdir -p $(dirname $@)
-	rm $@
-	touch $@
-	(echo -n 'Build date: ' ; date '+%Y.%m.%d') >> $@
-	(echo -n 'Build hostname: ' ; hostname) >> $@
-	(echo -n 'Build location: ' ; pwd) >> $@
-	cat $(TAGSFILE) >> $@
+# 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 monitor
+myplc-docs-SPEC := myplc-docs.spec
+ALL += myplc-docs
+
+# 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
+
+##############################
+# sfa requires python-2.7
+build_sfa=true
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
+build_sfa=false
+endif
 
+ifeq "$(build_sfa)" "true"
 #
-# MyPLC development environment
+# sfa - Slice Facility Architecture
 #
+sfa-MODULES := sfa
+sfa-SPEC := sfa.spec
+ALL += sfa
 
-###myplc-devel-MODULE := build myplc
-###myplc-devel-SPEC := myplc/myplc-devel.spec
-#### Package must be built as root
-###myplc-devel-RPMBUILD := sudo rpmbuild
-###ALL += myplc-devel
-
-#
-# Installation rules
-# 
-
-# Upload packages to boot server
-SERVER		:= root@onelab-plc.inria.fr
-RPMSAREA	:= /var/www/html/install-rpms/
-BOOTAREA	:= /var/www/html/boot/
-
-ifeq ($(PLDISTRO),planetlab)
-YUMGROUPS	:= groups/v3_yumgroups.xml
-else
-YUMGROUPS	:= groups/v4_onelab.xml
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
 endif
 
-#BASE		:= onelab
-BASENEW		:= build-$(notdir $(shell pwd))
-BASEBAK		:= planetlab-bak
-BASE		:= planetlab
-
-RPMS/yumgroups.xml:
-	install -D -m 644 $(YUMGROUPS) RPMS/yumgroups.xml
-
-INSTALL-TARGETS := install-rpms install-index install-adopt install-bootstrap
-install: $(INSTALL-TARGETS)
-
-install-help:
-	@echo install: $(INSTALL-TARGETS)
-
-install-rpms:RPMS/yumgroups.xml
-        # create repository
-	ssh $(SERVER) mkdir -p /plc/data/$(RPMSAREA)/$(BASENEW)
-	# populate
-	rsync -v --perms --times --group --compress --rsh=ssh \
-	   RPMS/yumgroups.xml $(wildcard RPMS/*/*.rpm) $(SERVER):/plc/data/$(RPMSAREA)/$(BASENEW)/
-
-install-index:
-	# sign and index new repository
-	ssh $(SERVER) chroot /plc/root /etc/plc.d/packages start $(RPMSAREA)/$(BASENEW)/ 2>> install-index.log
-
-install-clean-index:
-	# sign and index new repository
-	ssh $(SERVER) chroot /plc/root /etc/plc.d/packages clean $(RPMSAREA)/$(BASENEW)/ 2>> install-index.log
-
-install-adopt:
-	# cleanup former bak
-	ssh $(SERVER) rm -rf /plc/data/$(RPMSAREA)/$(BASEBAK)
-	# bak previous repo
-	ssh $(SERVER) mv /plc/data/$(RPMSAREA)/$(BASE) /plc/data/$(RPMSAREA)/$(BASEBAK)
-	# install new repo
-	ssh $(SERVER) mv /plc/data/$(RPMSAREA)/$(BASENEW) /plc/data/$(RPMSAREA)/$(BASE)
-
-install-bootstrap:
-	# install node image
-	install_bz2=$(wildcard BUILD/bootmanager-*/bootmanager/support-files/PlanetLab-Bootstrap.tar.bz2) ; \
-	  if [ -n "$$install_bz2" ] ; then rsync $$install_bz2 $(SERVER):/plc/data/$(BOOTAREA) ; fi
-#endif
-
-.PHONY: install
+##############################
+# don't build these by default, we have separate builds for that
+myslice-MODULES := myslice
+myslice-SPEC := myslice.spec
+#ALL += myslice
+
+manifold-MODULES := manifold
+manifold-SPEC := manifold.spec
+#ALL += manifold