X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build_devel.sh;h=f3da644183a4768aca66d29b24a57470b3c8af28;hb=c4339835a1f417ded1ccf56b046cd85f4fb440e8;hp=5b23db69c245ae93d920f334c4201d4a9f93bf58;hpb=17220eba8f749b87dd26f80453eb456cec18634e;p=myplc.git

diff --git a/build_devel.sh b/build_devel.sh
index 5b23db6..f3da644 100755
--- a/build_devel.sh
+++ b/build_devel.sh
@@ -15,38 +15,34 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: build_devel.sh,v 1.4 2006/08/11 18:34:59 thierry Exp $
+# $Id: build_devel.sh,v 1.7 2007/01/12 14:48:02 mlhuang Exp $
 #
 
 . build.functions
 
+# These directories are allowed to grow to unspecified size, so they
+# are stored as symlinks to the /data partition. mkfedora and yum
+# expect some of them to be real directories, however.
+datadirs=(
+/etc/planetlab
+/root
+/tmp
+/usr/tmp
+/var/tmp
+/var/log
+)
+for datadir in "${datadirs[@]}" ; do
+    # If we are being re-run, it may be a symlink
+    if [ -h devel/root/$datadir ] ; then
+	rm -f devel/root/$datadir
+	mkdir -p devel/root/$datadir
+    fi
+done
+
 echo "* myplc-devel: Installing base filesystem"
 mkdir -p devel/root
 make_chroot devel/root plc_devel_config.xml
 
-# Import everything (including ourself) into a private CVS tree
-echo "* myplc-devel: Building CVS repository"
-cvsroot=$PWD/devel/data/cvs
-mkdir -p $cvsroot
-cvs -d $cvsroot init
-
-myplc=$(basename $PWD)
-pushd ..
-for dir in * ; do
-    if [ ! -d $cvsroot/$dir ] ; then
-	pushd $dir
-	if [ "$dir" = "$myplc" ] ; then
-	    # Ignore generated files
-	    ignore="-I ! -I devel -I root -I root.img -I data" 
-	else
-	    ignore="-I !"
-	fi
-	cvs -d $cvsroot import -m "Initial import" -ko $ignore $dir planetlab $IMPORT_TAG
-	popd
-    fi
-done
-popd
-
 # Install configuration file
 echo "* myplc-devel: Installing configuration file"
 install -D -m 444 plc_devel_config.xml devel/data/etc/planetlab/default_config.xml
@@ -65,19 +61,35 @@ find plc.d/functions | cpio -p -d -u devel/root/etc/
 install -D -m 755 guest.init devel/root/etc/init.d/plc
 chroot devel/root sh -c 'chkconfig --add plc; chkconfig plc on'
 
-# handle root's homedir and tweak root prompt
-echo "* myplc-devel: root's homedir and prompt"
-roothome=devel/data/root
-mkdir -p $roothome
-cat << EOF > $roothome/.profile
-export PS1="<plc-devel> \$PS1"
+# Add a build user with the same ID as the current build user, who can
+# then cross-mount their home directory into the image and build MyPLC
+# in their home directory.
+echo "* myplc-devel: Adding build user"
+uid=${SUDO_UID:-2000}
+gid=${SUDO_GID:-2000}
+if ! grep -q "Automated Build" devel/root/etc/passwd ; then
+    chroot devel/root <<EOF
+groupadd -g $gid build
+useradd -c "Automated Build" -u $uid -g $gid -n -d /data/build -M -s /bin/bash build
+EOF
+fi
+
+# Copy build scripts to build home directory
+mkdir -p devel/data/build
+rsync -a $srcdir/build/ devel/data/build/
+
+# Allow build user to build certain RPMs as root
+cat >devel/root/etc/sudoers <<EOF
+root	ALL=(ALL) ALL
+build	ALL=(root) NOPASSWD: /usr/bin/rpmbuild
 EOF
-chmod 644 $roothome/.profile
 
 # Move "data" directories out of the installation
 echo "* myplc-devel: Moving data directories out of the installation"
-move_datadirs devel/root devel/data \
-    /etc/planetlab /build /cvs /root
+move_datadirs devel/root devel/data "${datadirs[@]}"
+
+# Fix permissions on tmp directories
+chmod 1777 devel/data/tmp devel/data/usr/tmp devel/data/var/tmp
 
 # Make image out of directory
 echo "* myplc-devel: Building loopback image"