merge changes from HEAD for next RC

diff --git a/packages.sh b/packages.sh
index 7665d4b..9bca07f 100755 (executable)
--- a/packages.sh
+++ b/packages.sh
@@ -6,7 +6,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004 The Trustees of Princeton University
 #
-# $Id: packages.sh,v 1.5 2004/10/30 15:26:28 mlhuang Exp $
+# $Id: packages.sh,v 1.7 2006/07/07 02:12:59 mlhuang Exp $
 #
 
 # Set defaults
@@ -59,11 +59,11 @@ xml_escape_cdata() {
 
 # XXX rpmquery version 4.3.1 crashes if too large of a queryformat is passed
 #TAGS=$(rpm --querytags)
-TAGS="NAME VERSION RELEASE URL BUILDTIME DESCRIPTION"
+TAGS="NAME VERSION RELEASE ARCH URL BUILDTIME DESCRIPTION"
 
 cat <<EOF
 <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<!-- \$Id: packages.sh,v 1.5 2004/10/30 15:26:28 mlhuang Exp $ -->
+<!-- \$Id: packages.sh,v 1.7 2006/07/07 02:12:59 mlhuang Exp $ -->
 <!-- Generated at $(date) in $(cd ${1-.} && pwd -P) on $HOSTNAME by $USER -->
 <!DOCTYPE PACKAGES [
   <!ELEMENT PACKAGES (PACKAGE)*>
@@ -96,7 +96,7 @@ BASE="$BASE"
 EOF
 
 # For every RPM in the current directory
-RPMS=$(find ${1-.} -name '*.rpm')
+RPMS=$(find ${1-.} -name '*.rpm' -and -not -name '*debuginfo*' | sort)
 for rpm in $RPMS ; do
 
 cat <<EOF

diff --git a/planetlab.mk b/planetlab.mk
index a2a6cad..13fa239 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: planetlab.mk,v 1.26 2006/07/06 20:54:19 mlhuang Exp $
+# $Id: planetlab.mk,v 1.27 2006/07/07 02:13:17 mlhuang Exp $
 #
 
 #
@@ -383,7 +383,7 @@ ifneq ($(BUILDS),)
        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
+       sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/RPMS" RPMS > packages.xml
         # Populate repository
        ssh $(SERVER) mkdir -p $(ARCHIVE)/$(BASE)/RPMS $(ARCHIVE)/$(BASE)/SRPMS
        rsync --delete --links --perms --times --group --compress --rsh=ssh \