X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=7238dbba6f88731da3208f329310a6a2d9d632ab;hb=refs%2Fheads%2Fnm-one-spec;hp=13e236c3d0705faa6f38581395163a8b498b8105;hpb=193c7fbc7779abb1156cccbd357e05aa511c0351;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 13e236c3..7238dbba 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -1,476 +1,520 @@
 #
-# 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: planetlab.mk,v 1.71 2007/09/25 18:38:47 faiyaza Exp $
+# see doc in Makefile  
 #
 
+# mkinitrd
 #
-# 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
-#
-# Add to ALL if you want the package built as part of the default set.
+ifeq "$(PLDISTROTAGS)" "planetlab-k32-tags.mk"
+ifeq "$(DISTRONAME)" "centos5"
+mkinitrd-MODULES := mkinitrd
+mkinitrd-SPEC := mkinitrd.spec
+mkinitrd-BUILD-FROM-SRPM := yes
+mkinitrd-STOCK-DEVEL-RPMS += parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel 
+mkinitrd-STOCK-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel
+ALL += mkinitrd
+IN_BOOTCD += mkinitrd
+IN_SLICEIMAGE += mkinitrd 
+IN_NODEIMAGE += mkinitrd
+IN_MYPLC += mkinitrd
+endif
+endif
 #
-
+# kernel
 #
-# Default values
+# use a package name with srpm in it:
+# so the source rpm is created by running make srpm in the codebase
 #
 
-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
-SVNROOT := http://svn.planet-lab.org/svn
-TAG := HEAD
-
-# 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
+kernel-MODULES := linux-2.6
+kernel-SPEC := kernel-2.6.spec
+kernel-BUILD-FROM-SRPM := yes
+ifeq "$(HOSTARCH)" "i386"
+kernel-RPMFLAGS:= --target i686
 else
-TAG := $(CVSTAG)
+kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
+kernel-SPECVARS += kernelconfig=planetlab
+KERNELS += kernel
+
+kernels: $(KERNELS)
+kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
+
+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)
+
+#
+# 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-LOCAL-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
+# iptables
 #
+iptables-MODULES := iptables
+iptables-SPEC := iptables.spec
+iptables-BUILD-FROM-SRPM := yes	
+iptables-LOCAL-DEVEL-RPMS += kernel-devel kernel-headers
+ALL += iptables
+IN_NODEIMAGE += iptables
 
-# Figure out whether we are building on i386 or x86_64 host
-HOSTARCH := $(shell uname -i)
-
-kernel-$(HOSTARCH)-MODULE := linux-2.6
-kernel-$(HOSTARCH)-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
-ifeq ($(HOSTARCH),i386)
-kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
-else
-kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
-endif
-
-ALL += kernel-$(HOSTARCH)
-
-kernel-clean: kernel-$(HOSTARCH)-clean
-kernel: kernel-$(HOSTARCH)
-
-
-###  Why are we building these??  -F
-### madwifi
-###
-##
-###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
-##
-###
-### ivtv 
-###
-##
-###ivtv-MODULE := ivtv
-###ivtv-SPEC := ivtv/ivtv.spec
-###ALL += ivtv
+#
+# 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
 
 #
-# NodeUpdate
+# 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
 
-NodeUpdate-MODULE := NodeUpdate
-NodeUpdate-SPEC := NodeUpdate/NodeUpdate.spec
-ALL += NodeUpdate
+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-LOCAL-DEVEL-RPMS += kernel-devel kernel-headers
+ALL += libnl
+IN_NODEIMAGE += libnl
+endif
 
 #
-# PlanetLabConf:  DEPRECATED.  
+# util-vserver-pl
 #
-# conf_files does the same thing in NM
-#
-
-#PlanetLabConf-MODULE := PlanetLabConf
-#PlanetLabConf-SPEC := PlanetLabConf/PlanetLabConf.spec
-#ALL += PlanetLabConf
+util-vserver-pl-MODULES := util-vserver-pl
+util-vserver-pl-SPEC := util-vserver-pl.spec
+util-vserver-pl-LOCAL-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
+ifeq "$(local_libnl)" "true"
+util-vserver-pl-LOCAL-DEVEL-RPMS += libnl libnl-devel
+endif
+ALL += util-vserver-pl
+IN_NODEIMAGE += util-vserver-pl
 
 #
-# ipod
+# NodeUpdate
 #
-
-PingOfDeath-MODULE := PingOfDeath
-PingOfDeath-SPEC := PingOfDeath/ipod.spec
-ALL += PingOfDeath
+nodeupdate-MODULES := nodeupdate
+nodeupdate-SPEC := NodeUpdate.spec
+ALL += nodeupdate
+IN_NODEIMAGE += nodeupdate
 
 #
-# sudo:  DEPRECATED
-#
-# Added functionality provided by this package to www/PlanetLabConf/sudoers.
+# ipod
 #
+ipod-MODULES := PingOfDeath
+ipod-SPEC := ipod.spec
+ALL += ipod
+IN_NODEIMAGE += ipod
 
-#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
 
+# nodemanager
 #
-# pycurl:  DEPRECATE
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
+
 #
-# [tony] use FC6+ release
+# pl_sshd
 #
-
-#curl_vernum := $(shell printf %d 0x$(shell curl-config --vernum))
-#pycurl_vernum := $(shell printf %d 0x070d01) # 7.13.1
-#pycurl_incompatnum := $(shell printf %d 0x071000) # 7.16.0
-#ifeq ($(shell test $(curl_vernum) -ge $(pycurl_vernum) && echo 1),1)
-#ifeq ($(shell test $(curl_vernum) -ge $(pycurl_incompatnum) && echo 0),1)
-#pycurl-MODULE := pycurl
-#pycurl-SPEC := pycurl/pycurl.spec
-#ALL += pycurl
-#endif
-#endif
+sshd-MODULES := pl_sshd
+sshd-SPEC := pl_sshd.spec
+ALL += sshd
+IN_NODEIMAGE += sshd
 
 #
-# BootServerRequest:  DEPRECATE
-#
-# Not used by anything.
+# codemux: Port 80 demux
 #
+codemux-MODULES := codemux
+codemux-SPEC   := codemux.spec
+ALL += codemux
+IN_NODEIMAGE += codemux
 
-#BootServerRequest-MODULE := BootServerRequest
-#BootServerRequest-SPEC := BootServerRequest/PLBootServerRequest.spec
-#ALL += BootServerRequest
 #
+# fprobe-ulog
 #
+fprobe-ulog-MODULES := fprobe-ulog
+fprobe-ulog-SPEC := fprobe-ulog.spec
+ALL += fprobe-ulog
+IN_NODEIMAGE += fprobe-ulog
+
 #
-# Node Manager
+# DistributedRateLimiting
 #
-
-NodeManager-MODULE := NodeManager
-NodeManager-SPEC := NodeManager/NodeManager.spec
-ALL += NodeManager
+DistributedRateLimiting-MODULES := DistributedRateLimiting
+DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+ALL += DistributedRateLimiting
+IN_NODEREPO += DistributedRateLimiting
 
 #
-# pl_sshd
+# pf2slice
 #
+pf2slice-MODULES := pf2slice
+pf2slice-SPEC := pf2slice.spec
+ALL += pf2slice
 
-pl_sshd-MODULE := pl_sshd
-pl_sshd-SPEC := pl_sshd/pl_sshd.spec
-ALL += pl_sshd
-
-#
-# libhttpd++: 
 #
-# Deprecate when vsys takes over [sapan].
-# keep in build for proper.
+# PlanetLab Mom: Cleans up your mess
 #
-
-libhttpd++-MODULE := libhttpd++
-libhttpd++-SPEC := libhttpd++/libhttpd++.spec
-ALL += libhttpd++
+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
-proper-RPMBUILD := sudo bash ./rpmbuild.sh
-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
 
 #
-# CoDemux: Port 80 demux
+# openvswitch
 #
+openvswitch-MODULES := openvswitch
+openvswitch-SPEC := openvswitch.spec
+openvswitch-LOCAL-DEVEL-RPMS += kernel-devel
 
-codemux-MODULE := codemux
-codemux-SPEC   := codemux/codemux.spec
-#ALL += codemux
+#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-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
+ifeq "$(local_inotify_tools)" "true"
+vsys-LOCAL-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
 #
-
-NetFlow-MODULE := NetFlow
-NetFlow-SPEC := NetFlow/netflow.spec
-ALL += NetFlow
-
-netflow: #mysql
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
+IN_NODEIMAGE += vsys-scripts
+ALL += vsys-scripts
 
 #
-# PlanetLab Mom: Cleans up your mess
+# plcapi
 #
+plcapi-MODULES := plcapi
+plcapi-SPEC := PLCAPI.spec
+ALL += plcapi
+IN_MYPLC += plcapi
 
-MoM-MODULE := MoM
-MoM-SPEC := MoM/pl_mom.spec
-ALL += MoM
+#
+# drupal
+# 
+drupal-MODULES := drupal
+drupal-SPEC := drupal.spec
+drupal-BUILD-FROM-SRPM := yes
+ALL += drupal
+IN_MYPLC += drupal
 
 #
-# iptables
+# use the plewww module instead
 #
-
-iptables-MODULE := iptables
-iptables-SPEC := iptables/iptables.spec
-ALL += iptables
-
-iptables: kernel
+plewww-MODULES := plewww
+plewww-SPEC := plewww.spec
+ALL += plewww
+IN_MYPLC += plewww
 
 #
-# iproute
+# 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
 
-iproute-MODULE := iproute2
-iproute-SPEC := iproute2/iproute.spec
-ALL += iproute
-
-#
-# kexec-tools:  DEPRECATE
 #
-# [marc]    use FC6+ release
+# pcucontrol
 #
-
-#kexec-tools-MODULE := kexec-tools
-#kexec-tools-SPEC := kexec-tools/kexec-tools.spec
-#ALL += kexec-tools
+pcucontrol-MODULES := pcucontrol
+pcucontrol-SPEC := pcucontrol.spec
+ALL += pcucontrol
 
 #
-# util-python
+# monitor
 #
-# [marc]    deprecate server.py
+monitor-MODULES := monitor
+monitor-SPEC := Monitor.spec
+monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel
+ALL += monitor
+IN_NODEIMAGE += monitor
+
 #
-# I dont know what the above means...  Daniel says we need to seperate util-vserver from
-# pl specific utilities (vuseradd, etc) which may or may not include vserver.py.  Until then,
-# I'm keeping this in the build.  -F
+# PLC RT
 #
+plcrt-MODULES := PLCRT
+plcrt-SPEC := plcrt.spec
+ALL += plcrt
 
-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
-
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 #
-# vsys
+# pyopenssl
 #
-vsys-MODULE := vsys
-vsys-SPEC := vsys/vsys.spec
-ALL += vsys
+pyopenssl-MODULES := pyopenssl
+pyopenssl-SPEC := pyOpenSSL.spec
+pyopenssl-BUILD-FROM-SRPM := yes
+ALL += pyopenssl
+endif
 
 #
-# PLCAPI
+# pyaspects
 #
+pyaspects-MODULES := pyaspects
+pyaspects-SPEC := pyaspects.spec
+pyaspects-BUILD-FROM-SRPM := yes
+ALL += pyaspects
 
-PLCAPI-MODULE := PLCAPI
-PLCAPI-SPEC := PLCAPI/PLCAPI.spec
-ALL += PLCAPI
+# 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)" "$(filter $(DISTRONAME),f8 f12 centos5)"
+build_sfa=false
+endif
 
+ifeq "$(build_sfa)" "true"
 #
-# PLCWWW
+# sfa - Slice Facility Architecture
 #
+sfa-MODULES := sfa
+sfa-SPEC := sfa.spec
+ALL += sfa
 
-PLCWWW-MODULE := WWW
-PLCWWW-SPEC := WWW/PLCWWW.spec
-ALL += PLCWWW
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
+endif
 
 #
-# vserver-reference
+# nodeconfig
 #
-
-VserverReference-MODULE := VserverReference build
-VserverReference-SPEC := VserverReference/vserver-reference.spec
-# Package must be built as root
-VserverReference-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += VserverReference
-
-# vserver-reference may require current packages
-vserver-reference: $(filter-out vserver-reference,$(ALL))
+nodeconfig-MODULES := nodeconfig
+nodeconfig-SPEC := nodeconfig.spec
+ALL += nodeconfig
+IN_MYPLC += nodeconfig
 
 #
-# BootManager
+# bootmanager
 #
+bootmanager-MODULES := bootmanager
+bootmanager-SPEC := bootmanager.spec
+ALL += bootmanager
+IN_MYPLC += bootmanager
 
-BootManager-MODULE := BootManager build
-BootManager-SPEC := BootManager/BootManager.spec
-BootManager-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += 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
 #
-
-BootCD-MODULE := BootCD build bootmanager
-BootCD-SPEC := BootCD/BootCD.spec
-BootCD-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += BootCD
-
-# BootCD requires current packages
-BootCD: $(filter-out BootCD,$(ALL))
+pyplnet-MODULES := pyplnet
+pyplnet-SPEC := pyplnet.spec
+ALL += pyplnet
+IN_NODEIMAGE += pyplnet
+IN_MYPLC += pyplnet
+IN_BOOTCD += pyplnet
 
 #
-# MyPLC
+# OMF resource controller
 #
-
-MyPLC-MODULE := build MyPLC new_plc_www plc/scripts
-MyPLC-SPEC := MyPLC/myplc.spec
-# Package must be built as root
-MyPLC-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += MyPLC
-
-# MyPLC may require current packages
-MyPLC: $(filter-out MyPLC,$(ALL))
-
-# ...and the yum manifest
-MyPLC: RPMS/yumgroups.xml
+omf-resctl-MODULES := omf
+omf-resctl-SPEC := omf-resctl.spec
+ALL += omf-resctl
+IN_SLICEIMAGE += omf-resctl
 
 #
-# MyPLC development environment
+# OMF exp controller
 #
-
-myplc-devel-MODULE := build myplc
-myplc-devel-SPEC := MyPLC/myplc-devel.spec
-# Package must be built as root
-myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += myplc-devel
+omf-expctl-MODULES := omf
+omf-expctl-SPEC := omf-expctl.spec
+ALL += omf-expctl
 
 #
-# MyPLC native
+# 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-native-MODULE := build MyPLC plc/scripts
-myplc-native-SPEC := MyPLC/myplc-native.spec
-# Package must be built as root
-myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += myplc-native
-
-# MyPLC may require current packages
-myplc-native: $(filter-out MyPLC,$(ALL))
-
-# ...and the yum manifest
-myplc-native: RPMS/yumgroups.xml
-
-
-#
-# libnl
 #
-# [daniel]    wait for latest Fedora release 
-# (03:29:46 PM) daniel_hozac: interfacing with the kernel directly when dealing with netlink was fugly, so... i had to find something nicer.
-# (03:29:53 PM) daniel_hozac: the one in Fedora is lacking certain APIs i need.
+# images for slices
 #
-
-libnl-MODULE := libnl
-libnl-SPEC := libnl/libnl.spec
-ALL += libnl
-
-util-vserver: libnl
+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
 
 #
-# Installation rules
+# vserver-specific sliceimage initialization
 # 
-
-# Upload packages to boot server
-SERVERA := build@boot1.planet-lab.org
-SERVERB := build@boot2.planet-lab.org
-ARCHIVE := /plc/data/var/www/html/install-rpms/archive
-
-# Put nightly alpha builds in a subdirectory
-ifeq ($(TAG),HEAD)
-ARCHIVE := $(ARCHIVE)/planetlab-alpha
-REPOS := /plc/data/var/www/html/install-rpms/planetlab-alpha
-endif
-
-RPMS/yumgroups.xml:
-	install -D -m 644 groups/v4_yumgroups.xml RPMS/yumgroups.xml
-
-install:
-ifeq ($(BASE),)
-	@echo make install is only meant to be called from ./build.sh
-else
-ifneq ($(wildcard /etc/planetlab/secring.gpg),)
-        # Sign all RPMS. setsid detaches rpm from the terminal,
-        # allowing the (hopefully blank) GPG password to be entered
-        # from stdin instead of /dev/tty. Obviously, the build server
-        # should be secure.
-	echo | setsid rpm \
-	--define "_signature gpg" \
-	--define "_gpg_path /etc/planetlab" \
-	--define "_gpg_name PlanetLab <info@planet-lab.org>" \
-	--resign RPMS/*/*.rpm
-endif
-ifneq ($(BUILDS),)
-        # Remove old runs
-	echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVERA) /bin/bash -s
-	echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVERB) /bin/bash -s
-endif
-        # Create package manifest
-	sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/RPMS" RPMS > packages.xml
-        # Update yum metadata
-	yum-arch RPMS >/dev/null
-	createrepo -g yumgroups.xml RPMS >/dev/null
-        # Populate repository
-	rsync \
-	--exclude '*-debuginfo-*' \
-	--recursive --links --perms --times --group --compress --rsh=ssh \
-	RPMS/ $(SERVERA):$(ARCHIVE)/$(BASE)
-	rsync \
-	--exclude '*-debuginfo-*' \
-	--recursive --links --perms --times --group --compress --rsh=ssh \
-	RPMS/ $(SERVERB):$(ARCHIVE)/$(BASE)
-ifeq ($(TAG),HEAD)
-        # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
-	if ! ssh $(SERVERA) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
-	    ssh $(SERVERA) ln -nsf archive/$(BASE) $(REPOS) ; \
-	fi
-        # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
-	if ! ssh $(SERVERB) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
-	    ssh $(SERVERB) ln -nsf archive/$(BASE) $(REPOS) ; \
-	fi
-
-endif
-endif
-
-.PHONY: install
+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
+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 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