X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=914101e14e7d6b0bf89acb3c314755b04eeacbc9;hb=feabe171befb088e618f59cdf0b853a356613460;hp=365537257d0849d482f0a148a04e86d90eae3b5b;hpb=3294d4aaac36230129f37a76aa79ce71f01b21c7;p=myplc.git

diff --git a/build.sh b/build.sh
index 3655372..914101e 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,16 @@
 #!/bin/bash
 #
-# Builds a Fedora based PLC image. You should be able to run this
-# script multiple times without a problem.
+# Builds MyPLC, either inside the MyPLC development environment in
+# devel/root (if PLC_DEVEL_BOOTSTRAP is true), or in the current host
+# environment (may be itself a MyPLC development environment or a
+# Fedora Core 4 environment with the appropriate development packages
+# installed).
+#
+# root.img (loopback image)
+# root/ (mount point)
+# data/ (various data files)
+# data/etc/planetlab/ (configuration files)
+# data/root (root's homedir)
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
@@ -9,271 +18,159 @@
 # $Id$
 #
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-# In both a normal CVS environment and a PlanetLab RPM
-# build environment, all of our dependencies are checked out into
-# directories at the same level as us.
-if [ -d ../build ] ; then
-    PATH=$PATH:../build
-    srcdir=..
-else
-    echo "Error: Could not find $(cd .. && pwd -P)/build/"
-    exit 1
-fi
-
-export PATH
-
-# PLC configuration file
-config=plc_config.xml
-
-# Release and architecture to install
-releasever=4
-basearch=i386
-
-# Initial size of the image
-size=1000000000
-
-usage()
-{
-    echo "Usage: build.sh [OPTION]..."
-    echo "	-c file		PLC configuration file (default: $config)"
-    echo "	-r release	Fedora release number (default: $releasever)"
-    echo "	-a arch		Fedora architecture (default: $basearch)"
-    echo "	-s size		Approximate size of the installation (default: $size)"
-    echo "	-h		This message"
-    exit 1
-}
-
-# Get options
-while getopts "c:r:a:s:h" opt ; do
-    case $opt in
-	c)
-	    config=$OPTARG
-	    ;;
-	r)
-	    releasever=$OPTARG
-	    ;;
-	a)
-	    basearch=$OPTARG
-	    ;;
-	s)
-	    size=$OPTARG
-	    ;;
-	h|*)
-	    usage
-	    ;;
-    esac
-done
-
-# Do not tolerate errors
-set -e
-
-root=root
-data=data
-
-if [ ! -f $root.img ] ; then
-    bs=4096
-    count=$(($size / 4096))
-    dd bs=$bs count=$count if=/dev/zero of=$root.img
-    mkfs.ext3 -j -F $root.img
-fi
-
-mkdir -p $root $data
-mount -o loop $root.img $root
-trap "umount $root" ERR
+. build.functions
 
 #
-# Build
+# Build myplc inside myplc-devel. Infinite recursion is avoided only
+# if PLC_DEVEL_BOOTSTRAP is false in the default configuration file.
 #
 
-# Get package list
-while read package ; do
-    packages="$packages -p $package"
-done < <(./plc-config --packages $config)
+if [ "$PLC_DEVEL_BOOTSTRAP" = "true" ] ; then
+    # So that we don't pollute the actual myplc-devel image, we use
+    # the directory that was used to build the image instead of the
+    # image itself, and mount everything by hand.
+    mount -o bind,rw devel/data devel/root/data
+    mount -t proc none devel/root/proc
+
+    # If we used a local mirror, bind mount it into the chroot so that
+    # we can use it again.
+    if [ "${PLC_DEVEL_FEDORA_URL:0:7}" = "file://" ] ; then
+	mkdir -p devel/root/data/fedora
+	mount -o bind,ro ${PLC_DEVEL_FEDORA_URL#file://} devel/root/data/fedora
+    fi
 
-# Install base system
-mkfedora -v -r $releasever -a $basearch -k $packages $root
+    # Clean up before exiting if anything goes wrong
+    trap "umount $PWD/devel/root/data/fedora;
+          umount $PWD/devel/root/data;
+          umount $PWD/devel/root/proc" ERR INT
+
+    # Build myplc inside myplc-devel. Make sure PLC_DEVEL_BOOTSTRAP is
+    # false to avoid infinite recursion.
+    chroot devel/root su - <<EOF
+set -x
+service plc start
+plc-config --category=plc_devel --variable=bootstrap --value="false" --save
+service plc reload
+cd /
+cvs -d /cvs checkout -r $BUILD_TAG build
+make TAG=$BUILD_TAG -C /build myplc
+EOF
 
-# Disable all services in reference image
-chroot $root sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off"
+    # Yoink the image that was just built
+    mv devel/data/build/BUILD/myplc-*/myplc/root{,.img} devel/data/build/BUILD/myplc-*/myplc/data .
 
-# FC2 minilogd starts up during shutdown and makes unmounting
-# impossible. Just get rid of it.
-rm -f $root/sbin/minilogd
-ln -nsf /bin/true $root/sbin/minilogd
+    # Clean up
+    umount devel/root/data/fedora || :
+    umount devel/root/data
+    umount devel/root/proc
+    rm -rf devel/data/build
+    mkdir -p devel/data/build
 
-# Build schema
-make -C $srcdir/pl_db
+    # No need to continue
+    exit 0
+fi
 
 #
-# Install
+# Build myplc in the host environment. This section is executed if
+# PLC_DEVEL_BOOTSTRAP is false.
 #
 
-# Install configuration scripts
-echo "* Installing configuration scripts"
-install -D -m 755 plc_config.py $root/tmp/plc_config.py
-chroot $root sh -c 'cd /tmp; python plc_config.py build; python plc_config.py install'
-install -D -m 755 plc-config $root/usr/bin/plc-config
-install -D -m 755 api-config $root/usr/bin/api-config
-
-# Install initscripts
-echo "* Installing initscripts"
-find plc.d | cpio -p -d -u $root/etc/
-install -D -m 755 guest.init $root/etc/init.d/plc
-chroot $root sh -c 'chkconfig --add plc; chkconfig plc on'
-
-# Install DB schema and API code
-echo "* Installing DB schema and API code"
-mkdir -p $root/usr/share
-rsync -a $srcdir/pl_db $srcdir/plc_api $root/usr/share/
-
-# Install web scripts
-echo "* Installing web scripts"
-mkdir -p $root/usr/bin
-install -m 755 \
-    $srcdir/plc/scripts/gen-sites-xml.py \
-    $srcdir/plc/scripts/gen-slices-xml-05.py \
-    $srcdir/plc/scripts/gen-static-content.py \
-    $root/usr/bin/
-
-# Install web pages
-echo "* Installing web pages"
-mkdir -p $root/var/www/html
-# Exclude old cruft, unrelated GENI pages, and official documents
-rsync -a \
-    --exclude='*2002' --exclude='*2003' \
-    --exclude=geni --exclude=PDN --exclude=Talks \
-    $srcdir/plc_www/ $root/var/www/html/
-
-# Install configuration file
-echo "* Installing configuration file"
-install -D -m 444 $config $data/etc/planetlab/default_config.xml
-install -D -m 444 plc_config.dtd $data/etc/planetlab/plc_config.dtd
-
-# Move "data" directories out of the installation
+# 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
 /var/lib/pgsql
 /var/www/html/alpina-logs
 /var/www/html/boot
 /var/www/html/download
+/var/www/html/files
 /var/www/html/generated
 /var/www/html/install-rpms
 /var/www/html/xml
+/tmp
+/usr/tmp
+/var/tmp
+/var/log
 )
-
-echo "* Moving data directories out of the installation"
-mkdir -p $root/data
 for datadir in "${datadirs[@]}" ; do
-    mkdir -p ${data}$datadir
-    if [ -d $root/$datadir -a ! -h $root/$datadir ] ; then
-	(cd $root && find ./$datadir | cpio -p -d -u ../$data/)
+    # If we are being re-run, it may be a symlink
+    if [ -h root/$datadir ] ; then
+	rm -f root/$datadir
+	mkdir -p root/$datadir
     fi
-    rm -rf $root/$datadir
-    mkdir -p $(dirname $root/$datadir)
-    ln -nsf /data$datadir $root/$datadir
 done
 
-# Shrink to 100 MB free space
-kb=$(python <<EOF
-import os
-df = os.statvfs('$root')
-target = 100 * 1024 * 1024 / df.f_bsize
-if df.f_bavail > target:
-    print (df.f_blocks - (df.f_bavail - target)) * df.f_bsize / 1024
-EOF
-)
+echo "* myplc: Installing base filesystem"
+mkdir -p root data
+make_chroot root plc_config.xml
 
-umount $root
-trap - ERR
+# Install configuration scripts
+echo "* myplc: Installing configuration scripts"
+install -D -m 755 plc_config.py root/tmp/plc_config.py
+chroot root sh -c 'cd /tmp; python plc_config.py build; python plc_config.py install'
+install -D -m 755 plc-config root/usr/bin/plc-config
+install -D -m 755 plc-config-tty root/usr/bin/plc-config-tty
+install -D -m 755 api-config root/usr/bin/api-config
+install -D -m 755 db-config root/usr/bin/db-config
+install -D -m 755 dns-config root/usr/bin/dns-config
 
-if [ -n "$kb" ] ; then
-    # Setup loopback association. Newer versions of losetup have a -f
-    # option which finds an unused loopback device, but we must
-    # support FC2 for now.
-    # dev_loop=$(losetup -f)
-    for i in `seq 1 7` ; do
-	if ! grep -q "^/dev/loop$i" /proc/mounts ; then
-	    dev_loop="/dev/loop$i"
-	    break
-	fi
-    done
-    losetup $dev_loop $root.img
-    trap "losetup -d $dev_loop" ERR
+# Install initscripts
+echo "* myplc: Installing initscripts"
+find plc.d | cpio -p -d -u root/etc/
+install -D -m 755 guest.init root/etc/init.d/plc
+chroot root sh -c 'chkconfig --add plc; chkconfig plc on'
 
-    # Resize the filesystem
-    echo "* Checking filesystem"
-    e2fsck -a -f $dev_loop
-    echo "* Shrinking filesystem"
-    resize2fs $dev_loop ${kb}K
+# Install web scripts
+echo "* myplc: Installing web scripts"
+mkdir -p root/usr/bin
+install -m 755 \
+    $srcdir/plc/scripts/gen-sites-xml.py \
+    $srcdir/plc/scripts/gen-slices-xml-05.py \
+    $srcdir/plc/scripts/gen-static-content.py \
+    root/usr/bin/
 
-    # Tear down loopback association
-    losetup -d $dev_loop
-    trap - ERR
+# Install web pages
+echo "* myplc: Installing web pages"
+mkdir -p root/var/www/html
+rsync -a $srcdir/new_plc_www/ root/var/www/html/
 
-    # Truncate the image file
-    perl -e "truncate '$root.img', $kb*1024"
-fi
+# Install Drupal rewrite rules
+install -D -m 644 $srcdir/new_plc_www/drupal.conf root/etc/httpd/conf.d/drupal.conf
 
-# Write sysconfig
-cat >plc.sysconfig <<EOF
-PLC_ROOT=/plc/$root
-PLC_DATA=/plc/$data
-#PLC_OPTIONS="-v"
+# Install configuration file
+echo "* myplc: Installing configuration file"
+install -D -m 444 $config data/etc/planetlab/default_config.xml
+install -D -m 444 plc_config.dtd data/etc/planetlab/plc_config.dtd
+
+# handle root's homedir and tweak root prompt
+echo "* myplc: root's homedir and prompt"
+roothome=data/root
+mkdir -p $roothome
+cat << EOF > $roothome/.profile
+export PS1="<plc> \$PS1"
 EOF
+chmod 644 $roothome/.profile
 
-# Initialize node RPMs directory. The PlanetLab-Bootstrap.tar.bz2
-# tarball already contains all of the node RPMs pre-installed. Only
-# updates or optional packages should be placed in this directory.
-if [ -n "$RPM_BUILD_DIR" ] ; then
-    echo "* Initializing node RPMs directory"
-    RPM_RPMS_DIR=$(cd $(dirname $RPM_BUILD_DIR)/RPMS && pwd -P)
-    mkdir -p $data/var/www/html/install-rpms/planetlab
-    if [ -f $RPM_RPMS_DIR/yumgroups.xml ] ; then
-	install -D -m 644 $RPM_RPMS_DIR/yumgroups.xml \
-	    $data/var/www/html/install-rpms/planetlab/yumgroups.xml
-    fi
-    # yum-2.0.x
-    if [ -x /usr/bin/yum-arch ] ; then
-	yum-arch $data/var/www/html/install-rpms/planetlab
-    fi
-    # yum-2.4.x
-    if [ -x /usr/bin/createrepo ] ; then
-	if [ -f $data/var/www/html/install-rpms/planetlab/yumgroups.xml ] ; then
-	    groupfile="-g yumgroups.xml"
-	fi
-	createrepo $groupfile $data/var/www/html/install-rpms/planetlab
-    fi
-fi
-
-# Bootstrap the system for quicker startup (and to populate the
-# PlanetLabConf tables from PLC, which may not be accessible
-# later). The bootstrap.xml configuration overlay configures the web
-# server to run on an alternate port (in case the build machine itself
-# is running a web server on port 80). Start everything up to
-# bootstrap the database, then shut it back down again immediately.
-echo "* Bootstrapping installation"
-
-install -D -m 644 bootstrap.xml $data/etc/planetlab/configs/bootstrap.xml
-
-# Otherwise, host.init will try to read /etc/sysconfig/plc
-export PLC_ROOT=$PWD/$root
-export PLC_DATA=$PWD/$data
-#export PLC_OPTIONS="-v"
+# Move "data" directories out of the installation
+echo "* myplc: Moving data directories out of the installation"
+move_datadirs root data "${datadirs[@]}"
 
-./host.init start
-RETVAL=$?
+# Fix permissions on tmp directories
+chmod 1777 data/tmp data/usr/tmp data/var/tmp
 
-# Remove ISO and USB images, which take up >100MB but only take a
-# couple of seconds to generate at first boot.
-rm -f $data/var/www/html/download/*.{iso,usb}
+# Remove generated bootmanager script
+rm -f data/var/www/html/boot/bootmanager.sh
 
-./host.init stop
-RETVAL=$(($RETVAL+$?))
+# Initialize node RPMs directory. The PlanetLab-Bootstrap.tar.bz2
+# tarball already contains all of the node RPMs pre-installed. Only
+# updates or optional packages should be placed in this directory.
+install -D -m 644 ../build/groups/v3_yumgroups.xml \
+    data/var/www/html/install-rpms/planetlab/yumgroups.xml
 
-# Restore default configuration
-rm -f $data/etc/planetlab/configs/bootstrap.xml
-install -D -m 444 $config $data/etc/planetlab/plc_config.xml
+# Make image out of directory
+echo "* myplc: Building loopback image"
+make_image root root.img
 
-exit $RETVAL
+exit 0