X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=9bb91dccdd89b4c7d5f85055973b3010b7f177ec;hb=refs%2Fheads%2Fplanetlab-3_3-branch;hp=d2708070082c2190a777eb0c369de0c67d345173;hpb=d7cb7b8b1144544b5c3ba0777f02c6e97209b7ba;p=sliceimage.git

diff --git a/build.sh b/build.sh
index d270807..9bb91dc 100755
--- a/build.sh
+++ b/build.sh
@@ -8,12 +8,12 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2005 The Trustees of Princeton University
 #
-# $Id: vserver-reference.init,v 1.17 2005/09/02 19:46:37 mlhuang Exp $
+# $Id: build.sh,v 1.4.2.1 2006/05/26 15:27:44 mlhuang Exp $
 #
 
 # Get the production /etc/yum.conf file. XXX When MAs begin deploying
 # their own boot servers and/or code, this will have to change.
-curl --silent http://boot.planet-lab.org/$(curl --silent --insecure --form node_id=0 --form file=/etc/yum.conf https://boot.planet-lab.org/db/plnodeconf/getsinglefile.php) > yum.conf
+curl --silent http://boot.planet-lab.org/$(curl --silent --insecure --form node_id=1 --form file=/etc/yum.conf https://boot.planet-lab.org/db/plnodeconf/getsinglefile.php) > yum.conf
 
 # Solve the bootstrap problem by including any just built packages in
 # the yum configuration. This cooperates with the PlanetLab build
@@ -33,6 +33,13 @@ d
 EOF
 
     # And replace them with a section for the RPMS that were just built
+    yum-arch $(dirname $RPM_BUILD_DIR)/RPMS
+    createrepo -g yumgroups.xml $(dirname $RPM_BUILD_DIR)/RPMS || :
+    # If run under sudo, allow user to delete the headers/ and
+    # repodata/ directories.
+    if [ -n "$SUDO_USER" ] ; then
+	chown -R $SUDO_USER $(dirname $RPM_BUILD_DIR)/RPMS
+    fi
     cat >> yum.conf <<EOF
 [Bootstrap]
 name=Bootstrap RPMS -- $(dirname $RPM_BUILD_DIR)/RPMS/
@@ -113,6 +120,9 @@ rpm --root $VROOT --initdb
 # Go, baby, go
 yum -c yum.conf --installroot=$VROOT -y groupinstall VServer
 
+# Clean yum cache
+yum -c yum.conf --installroot=$VROOT -y clean all
+
 # Remove stale RPM locks
 rm -f $VROOT/var/lib/rpm/__db*