Revert to 1.30

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index eb7fb38..daef499 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: planetlab.mk,v 1.45.2.7 2007/02/09 01:34:38 mlhuang Exp $
 #
 
 #
@@ -28,15 +28,21 @@
 # Default values
 #
 
+CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
+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)
-TAG := $(shell cvs status planetlab.mk | sed -ne 's/[[:space:]]*Sticky Tag:[[:space:]]*\([^[:space:]]*\).*/\1/p')
-ifeq ($(TAG),(none))
+ifeq ($(CVSTAG),(none))
 TAG := HEAD
-endif
 else
-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
-TAG := HEAD
+TAG := $(CVSTAG)
+endif
+endif
 endif
 
 #
@@ -64,16 +70,9 @@ vnet: kernel
 
 util-vserver-MODULE := util-vserver
 util-vserver-SPEC := util-vserver/util-vserver.spec
+util-vserver-RPMFLAGS:= --without dietlibc
 ALL += util-vserver
 
-#
-# yum
-#
-
-yum-MODULE := yum
-yum-SPEC := yum/yum.spec
-ALL += yum
-
 #
 # PlanetLabAccounts
 #
@@ -142,9 +141,9 @@ ALL += PlanetLabID
 # Node Manager
 #
 
-sidewinder-MODULE := sidewinder
-sidewinder-SPEC := sidewinder/sidewinder.spec
-ALL += sidewinder
+NodeManager-MODULE := NodeManager
+NodeManager-SPEC := NodeManager/NodeManager.spec
+ALL += NodeManager
 
 #
 # pl_sshd
@@ -234,14 +233,6 @@ 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
 #
@@ -256,20 +247,12 @@ util-vserver: util-python
 PlanetLabAuth: util-python
 
 #
-# PlanetLabAuth
-#
-
-PlanetLabAuth-MODULE := pl_auth
-PlanetLabAuth-SPEC := pl_auth/pl_auth.spec
-ALL += PlanetLabAuth
-
-#
-# plcapilib
+# PLCAPI
 #
 
-plcapilib-MODULE := plcmdline
-plcapilib-SPEC := plcmdline/plcapilib.spec
-ALL += plcapilib
+PLCAPI-MODULE := new_plc_api
+PLCAPI-SPEC := new_plc_api/PLCAPI.spec
+ALL += PLCAPI
 
 #
 # vserver-reference
@@ -315,7 +298,7 @@ bootcd: $(filter-out bootcd,$(ALL))
 # MyPLC
 #
 
-myplc-MODULE := $(sort $(foreach module,$(ALL),$($(module)-MODULE))) myplc
+myplc-MODULE := build myplc new_plc_www plc/scripts
 myplc-SPEC := myplc/myplc.spec
 # Package must be built as root
 myplc-RPMBUILD := sudo rpmbuild
@@ -327,18 +310,28 @@ myplc: $(filter-out myplc,$(ALL))
 # ...and the yum manifest
 myplc: RPMS/yumgroups.xml
 
+#
+# MyPLC development environment
+#
+
+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 := build@boot.planet-lab.org
-ARCHIVE := /var/www/html/install-rpms/archive
+ARCHIVE := /plc/data/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
+REPOS := /plc/data/var/www/html/install-rpms/planetlab-alpha
 endif
 
 RPMS/yumgroups.xml:
@@ -357,7 +350,7 @@ ifneq ($(wildcard /etc/planetlab/secring.gpg),)
        --define "_signature gpg" \
        --define "_gpg_path /etc/planetlab" \
        --define "_gpg_name PlanetLab <info@planet-lab.org>" \
-       --resign RPMS/*/*.rpm SRPMS/*.rpm
+       --resign RPMS/*/*.rpm
 endif
 ifneq ($(BUILDS),)
         # Remove old runs
@@ -365,20 +358,18 @@ ifneq ($(BUILDS),)
 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
-       ssh $(SERVER) mkdir -p $(ARCHIVE)/$(BASE)/RPMS $(ARCHIVE)/$(BASE)/SRPMS
-       rsync --delete --links --perms --times --group --compress --rsh=ssh \
-           $(sort $(subst -debuginfo,,$(wildcard RPMS/yumgroups.xml RPMS/*/*.rpm))) $(SERVER):$(ARCHIVE)/$(BASE)/RPMS/
-       ssh $(SERVER) yum-arch $(ARCHIVE)/$(BASE)/RPMS >/dev/null
-       ssh $(SERVER) createrepo -g yumgroups.xml $(ARCHIVE)/$(BASE)/RPMS >/dev/null
-       rsync --delete --links --perms --times --group --compress --rsh=ssh \
-           $(wildcard SRPMS/*.rpm) $(SERVER):$(ARCHIVE)/$(BASE)/SRPMS/
-       ssh $(SERVER) yum-arch $(ARCHIVE)/$(BASE)/SRPMS >/dev/null
-       ssh $(SERVER) createrepo $(ARCHIVE)/$(BASE)/SRPMS >/dev/null
+       rsync \
+       --exclude '*-debuginfo-*' \
+       --recursive --links --perms --times --group --compress --rsh=ssh \
+       RPMS/ $(SERVER):$(ARCHIVE)/$(BASE)
 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) ; \
+           ssh $(SERVER) ln -nsf $(ARCHIVE)/$(BASE) $(REPOS) ; \
        fi
 endif
 endif