merge changes from head

diff --git a/planetlab.mk b/planetlab.mk
index 2a5cf38..203adb5 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.4 2007/02/08 00:25:37 mlhuang Exp $
 #
 
 #
@@ -49,9 +49,23 @@ endif
 # kernel
 #
 
-kernel-MODULE := linux-2.6
-kernel-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
-ALL += 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-planetlab.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-planetlab.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
 
 #
 # vnet
@@ -64,6 +78,25 @@ ALL += vnet
 # Build kernel first so we can bootstrap off of its build
 vnet: kernel
 
+#
+# 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
+
 #
 # util-vserver
 #
@@ -326,12 +359,12 @@ ALL += myplc-devel
 
 # 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:
@@ -350,7 +383,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
@@ -358,20 +391,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