From 46267bd73a47307120b81fc12be8c9d4aea949b8 Mon Sep 17 00:00:00 2001
From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 21 Aug 2006 21:27:43 +0000
Subject: [PATCH] merge to HEAD as of 2006-08-21

---
 Makefile                |  4 +++-
 groups/v3_yumgroups.xml |  2 ++
 mkfedora                | 28 +++++++++++++++++-----------
 planetlab.mk            | 18 ++++++++++++------
 4 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 72cb1a79..65a74585 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.85 2006/03/08 21:29:25 mlhuang Exp $
+# $Id: Makefile,v 1.87 2006/08/11 12:28:38 thierry Exp $
 #
 
 # Default target
@@ -28,7 +28,9 @@ all: $(ALL)
 
 # Recurse
 $(ALL):
+	@echo -n "XXXXXXXXXXXXXXX -- BEG $@ " ; date
 	$(MAKE) package=$@
+	@echo -n "XXXXXXXXXXXXXXX -- END $@ " ; date
 
 # Remove files generated by this package
 $(foreach package,$(ALL),$(package)-clean): %-clean:
diff --git a/groups/v3_yumgroups.xml b/groups/v3_yumgroups.xml
index 8598c52f..680ce5eb 100644
--- a/groups/v3_yumgroups.xml
+++ b/groups/v3_yumgroups.xml
@@ -97,6 +97,8 @@
 
       <packagereq type="mandatory">schedutils</packagereq>
 
+      <packagereq type="default">vconfig</packagereq>
+
       <packagereq type="mandatory">util-vserver</packagereq>
       <packagereq type="mandatory">util-vserver-build</packagereq>
       <packagereq type="mandatory">util-vserver-lib</packagereq>
diff --git a/mkfedora b/mkfedora
index 987f9767..36c10a2e 100755
--- a/mkfedora
+++ b/mkfedora
@@ -13,7 +13,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id: mkfedora,v 1.17 2006/07/17 21:25:42 mlhuang Exp $
+# $Id: mkfedora,v 1.20 2006/08/16 01:56:06 mlhuang Exp $
 #
 
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -23,12 +23,11 @@ verbose=0
 
 # Default yum repositories to try
 mirrors=(
-file:///usr/share/mirrors/fedora
-file:///var/www/html/mirrors/fedora
-ftp://smoke.cs.princeton.edu/pub/mirrors/fedora
-ftp://128.112.137.30/pub/mirrors/fedora
+file:///data/fedora
 http://coblitz.planet-lab.org/pub/fedora
 ftp://mirror.cs.princeton.edu/pub/mirrors/fedora
+ftp://mirror.stanford.edu/pub/mirrors/fedora
+ftp://rpmfind.net/linux/fedora
 )
 
 # Release and architecture to install
@@ -327,15 +326,22 @@ yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes install glibc
 
 # Go, baby, go
 if [ ${#packages[*]} -gt 0 ] ; then
-    echo "* Installing optional packages" >&3
-    yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \
-	install "${packages[@]}"
+   echo "* Installing optional packages" "${packages[@]}" >&3
+   yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \
+	  install "${packages[@]}"
+   if ! rpm --root $vroot -q "${packages[@]}" >/dev/null ; then
+       echo "* Warning: Missing packages"
+       rpm --root $vroot -q "${packages[@]}" | grep "not installed"
+   fi
 fi
 
 if [ ${#groups[*]} -gt 0 ] ; then
-    echo "* Installing optional groups" >&3
-    yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \
-	groupinstall "${groups[@]}"
+   ## call yum sequentially to get finer-grained info on dependencies
+   for grp in "${groups[@]}" ; do
+      echo "* Installing optional group $grp" >&3
+      yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \
+	groupinstall "$grp"
+   done
 fi
 
 # FC2 dev %preinstall checks /proc/mounts to make sure that /dev is
diff --git a/planetlab.mk b/planetlab.mk
index 2757d9b8..c8923d12 100644
--- 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.30 2006/07/15 19:49:40 mlhuang Exp $
+# $Id: planetlab.mk,v 1.31 2006/07/28 04:53:14 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
 
 #
-- 
2.47.0