- per Thierry's suggestions, separate out PlanetLab-specific pieces into

  separate site-specific Makefile planetlab.mk.

diff --git a/planetlab.mk b/planetlab.mk
new file mode 100644 (file)
index 0000000..13a9ba1
--- /dev/null
+++ b/planetlab.mk
@@ -0,0 +1,362 @@
+#
+# PlanetLab standard components list
+#
+# Mark Huang <mlhuang@cs.princeton.edu>
+# Copyright (C) 2003-2006 The Trustees of Princeton University
+#
+# $Id: Makerules,v 1.18 2005/12/15 17:02:07 mlhuang Exp $
+#
+
+#
+# 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.
+#
+
+#
+# Default values
+#
+
+CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
+TAG := HEAD
+
+#
+# kernel
+#
+
+kernel-MODULE := linux-2.6
+kernel-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
+ALL += kernel
+
+#
+# vnet
+#
+
+vnet-MODULE := vnet
+vnet-SPEC := vnet/vnet.spec
+ALL += vnet
+
+# Build kernel first so we can bootstrap off of its build
+vnet: kernel
+
+#
+# util-vserver
+#
+
+util-vserver-MODULE := util-vserver
+util-vserver-SPEC := util-vserver/util-vserver.spec
+ALL += util-vserver
+
+#
+# lkcdutils
+#
+
+lkcdutils-MODULE := lkcdutils
+lkcdutils-SPEC := lkcdutils/spec/lkcdutils.spec
+ALL += lkcdutils
+
+# Build kernel first so we can bootstrap off of its build
+lkcdutils: kernel
+
+#
+# yum
+#
+
+yum-MODULE := yum
+yum-SPEC := yum/yum.spec
+ALL += yum
+
+#
+# ksymoops
+#
+
+ksymoops-MODULE := ksymoops
+ksymoops-SPEC := ksymoops/ksymoops.spec
+ALL += ksymoops
+
+#
+# PlanetLabAccounts
+#
+
+PlanetLabAccounts-MODULE := PlanetLabAccounts
+PlanetLabAccounts-SPEC := PlanetLabAccounts/PlanetLabAccounts.spec
+ALL += PlanetLabAccounts
+
+#
+# NodeUpdate
+#
+
+NodeUpdate-MODULE := NodeUpdate
+NodeUpdate-SPEC := NodeUpdate/NodeUpdate.spec
+ALL += NodeUpdate
+
+#
+# PlanetLabConf
+#
+
+PlanetLabConf-MODULE := PlanetLabConf
+PlanetLabConf-SPEC := PlanetLabConf/PlanetLabConf.spec
+ALL += PlanetLabConf
+
+#
+# PlanetLabKeys
+#
+
+PlanetLabKeys-MODULE := PlanetLabKeys
+PlanetLabKeys-SPEC := PlanetLabKeys/PlanetLabKeys.spec
+ALL += PlanetLabKeys
+
+#
+# ipod
+#
+
+ipod-MODULE := ipod
+ipod-SPEC := ipod/ipod.spec
+ALL += ipod
+
+#
+# sudo
+#
+
+sudo-MODULE := sudo
+sudo-SPEC := sudo/planetlab_sudo.spec
+ALL += sudo
+
+#
+# pycurl
+#
+
+pycurl-MODULE := pycurl
+pycurl-SPEC := pycurl/pycurl.spec
+ALL += pycurl
+
+#
+# BootServerRequest
+#
+
+BootServerRequest-MODULE := BootServerRequest
+BootServerRequest-SPEC := BootServerRequest/PLBootServerRequest.spec
+ALL += BootServerRequest
+
+#
+# PlanetLabID
+#
+
+PlanetLabID-MODULE := PlanetLabID
+PlanetLabID-SPEC := PlanetLabID/PlanetLabID.spec
+ALL += PlanetLabID
+
+#
+# Node Manager
+#
+
+sidewinder-MODULE := sidewinder
+sidewinder-SPEC := sidewinder/sidewinder.spec
+ALL += sidewinder
+
+#
+# pl_sshd
+#
+
+pl_sshd-MODULE := pl_sshd
+pl_sshd-SPEC := pl_sshd/pl_sshd.spec
+ALL += pl_sshd
+
+#
+# Resource Management Tools
+#
+
+resman-MODULE := resman
+resman-SPEC := resman/resman.spec
+ALL += resman
+
+#
+# libhttpd++: 
+#
+
+libhttpd++-MODULE := libhttpd++
+libhttpd++-SPEC := libhttpd++/libhttpd++.spec
+ALL += libhttpd++
+
+#
+# Proper: Privileged Operations Service
+#
+
+proper-MODULE := proper
+proper-SPEC := proper/proper.spec
+ALL += proper
+
+proper: libhttpd++
+
+#
+# ulogd
+#
+
+ulogd-MODULE := ulogd
+ulogd-SPEC := ulogd/ulogd.spec
+ALL += ulogd
+
+ulogd: kernel proper
+
+#
+# netflow
+#
+
+netflow-MODULE := netflow
+netflow-SPEC := netflow/netflow.spec
+ALL += netflow
+
+#
+# PlanetLab Mom: Cleans up your mess
+#
+
+pl_mom-MODULE := pl_mom
+pl_mom-SPEC := pl_mom/pl_mom.spec
+ALL += pl_mom
+
+#
+# iptables
+#
+
+iptables-MODULE := iptables
+iptables-SPEC := iptables/iptables.spec
+ALL += iptables
+
+iptables: kernel
+
+#
+# iproute
+#
+
+iproute-MODULE := iproute2
+iproute-SPEC := iproute2/iproute.spec
+ALL += iproute
+
+#
+# kexec-tools
+#
+
+kexec-tools-MODULE := kexec-tools
+kexec-tools-SPEC := kexec-tools/kexec-tools.spec
+ALL += kexec-tools
+
+#
+# dhcp
+#
+
+dhcp-MODULE := dhcp
+dhcp-SPEC := dhcp/dhcp.spec
+ALL += dhcp
+
+#
+# util-python
+#
+
+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
+
+#
+# vserver-reference
+#
+
+vserver-reference-MODULE := vserver-reference
+vserver-reference-SPEC := vserver-reference/vserver-reference.spec
+# Package must be built as root
+vserver-reference-RPMBUILD := sudo rpmbuild
+ALL += vserver-reference
+
+# vserver-reference may require current packages
+vserver-reference: $(filter-out vserver-reference,$(ALL))
+
+# ...and the yum manifest
+vserver-reference: RPMS/yumgroups.xml
+
+#
+# bootmanager
+#
+
+bootmanager-MODULE := bootmanager
+bootmanager-SPEC := bootmanager/bootmanager.spec
+bootmanager-RPMBUILD := sudo rpmbuild
+ALL += bootmanager
+
+# bootmanager requires current packages
+bootmanager: $(filter-out bootmanager,$(ALL))
+
+# ...and the yum manifest
+bootmanager: RPMS/yumgroups.xml
+
+#
+# bootcd
+#
+
+bootcd-MODULE := bootcd_v3
+bootcd-SPEC := bootcd_v3/bootcd.spec
+bootcd-RPMBUILD := sudo rpmbuild
+ALL += bootcd
+
+# bootcd requires current packages
+bootcd: $(filter-out bootcd,$(ALL))
+
+# ...and the yum manifest
+bootcd: RPMS/yumgroups.xml
+
+#
+# Installation rules
+# 
+
+# Upload packages to boot server
+SERVER := build@boot.planet-lab.org
+ARCHIVE := /var/www/html/install-rpms/archive
+
+# Put nightly alpha builds in a subdirectory
+ifeq ($(TAG),HEAD)
+ARCHIVE := $(ARCHIVE)/planetlab-alpha
+REPOS := /var/www/html/install-rpms/planetlab-alpha
+endif
+
+RPMS/yumgroups.xml:
+       install -D -m 644 groups/v3_yumgroups.xml RPMS/yumgroups.xml
+       yum-arch RPMS
+
+install:
+ifeq ($(BASE),)
+       @echo make install is only meant to be called from ./build.sh
+else
+ifneq ($(BUILDS),)
+        # Remove old runs
+       echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVER) /bin/bash -s
+endif
+        # Create package manifest
+       sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/SRPMS" SRPMS > SRPMS/packages.xml
+        # Populate repository
+       ssh $(SERVER) mkdir -p $(ARCHIVE)/$(BASE)
+       rsync --delete --links --perms --times --group --compress --rsh=ssh \
+           --exclude "*-debuginfo-*.rpm" RPMS SRPMS $(SERVER):$(ARCHIVE)/$(BASE)/
+       ssh $(SERVER) yum-arch $(ARCHIVE)/$(BASE)/RPMS $(ARCHIVE)/$(BASE)/SRPMS >/dev/null
+       ssh $(SERVER) createrepo $(ARCHIVE)/$(BASE)/RPMS $(ARCHIVE)/$(BASE)/SRPMS >/dev/null
+ifeq ($(TAG),HEAD)
+        # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
+       if ! ssh $(SERVER) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
+           ssh $(SERVER) ln -nsf $(ARCHIVE)/$(BASE)/RPMS/ $(REPOS) ; \
+       fi
+endif
+endif
+
+.PHONY: install