From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 6 Jun 2005 21:54:55 +0000 (+0000)
Subject: alpina is deprecated; copy yumgroups files here under build/groups/
X-Git-Tag: planetlab-3_2-branch-point~17
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b7957eaa10c46f94be8d45c4c8a0abcf00485899;p=build.git

alpina is deprecated; copy yumgroups files here under build/groups/
---

diff --git a/Makefile b/Makefile
index 6a5a501d..be3259a9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.69 2005/05/04 21:47:39 mlhuang Exp $
+# $Id: Makefile,v 1.70 2005/06/06 18:07:45 smuir Exp $
 #
 
 # Default target
@@ -287,8 +287,7 @@ ifeq ($(findstring $(package),$(ALL)),)
 
 # Build all packages
 all: $(ALL)
-        # XXX Should check out a tagged version of yumgroups.xml
-	cvs -d $(CVSROOT) checkout -p alpina/groups/v3_yumgroups.xml > RPMS/yumgroups.xml
+	install -D -m 644 groups/v3_yumgroups.xml RPMS/yumgroups.xml
         # Create package manifest
 	sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/SRPMS" SRPMS > SRPMS/packages.xml
 
diff --git a/devbox.sh b/devbox.sh
index 69a37fc0..bc5763f8 100644
--- a/devbox.sh
+++ b/devbox.sh
@@ -3,7 +3,7 @@
 # PlanetLab devbox release script. Intended to be used by scripts and
 # crontabs to build nightly releases (default).
 #
-# $Id:$
+# $Id: devbox.sh,v 1.1 2005/03/02 07:21:05 mef Exp $
 #
 
 # Set defaults
@@ -73,7 +73,7 @@ for RELEASE in devbox alpha-devbox beta-devbox ; do
     ssh $SERVER ln -nf ${REPOSITORY}/$BUILT/*.rpm ${REPOSITORY}/${TMPDEVBOXRELEASE}
 
     mkdir -p ${BASE}/${DEVBOXRELEASE}
-    cvs -d ${CVSROOT} checkout -p alpina/groups/${RELEASE}_yumgroups.xml > ${BASE}/${DEVBOXRELEASE}/yumgroups.xml
+    install -D -m 644 groups/${RELEASE}_yumgroups.xml ${BASE}/${DEVBOXRELEASE}/yumgroups.xml
     scp ${BASE}/${DEVBOXRELEASE}/yumgroups.xml ${SERVER}:${REPOSITORY}/${TMPDEVBOXRELEASE}/yumgroups.xml
 
     ssh $SERVER yum-arch ${REPOSITORY}/${TMPDEVBOXRELEASE} >/dev/null
diff --git a/plc.mk b/plc.mk
index 4bf9eedd..4ca0410b 100644
--- a/plc.mk
+++ b/plc.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id: plc.mk,v 1.1 2005/05/04 21:47:56 mlhuang Exp $
+# $Id: plc.mk,v 1.2 2005/05/09 17:18:37 mlhuang Exp $
 #
 
 # Default target
@@ -103,7 +103,7 @@ ifeq ($(findstring $(package),$(ALL)),)
 
 # Build all packages
 all: $(ALL)
-	cvs -d $(CVSROOT) checkout -p alpina/groups/stock_fc2_groups.xml > RPMS/yumgroups.xml
+	install -D -m 644 groups/stock_fc2_groups.xml RPMS/yumgroups.xml
 
 # Recurse
 $(ALL):