X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=2e03f6bee54e5f81123daede2061079e6611722f;hb=6e0f0beb542f11b450cfd98ccaea6d4c4a423725;hp=8f2ee3ae1c20a0b8305301f65d225af2d40bc162;hpb=647251f7d523bfceab47064f7599037d6624853f;p=myplc.git diff --git a/build.sh b/build.sh index 8f2ee3a..2e03f6b 100755 --- a/build.sh +++ b/build.sh @@ -3,7 +3,7 @@ # 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 environment with the appropriate development packages +# Fedora Core 4 environment with the appropriate development packages # installed). # # root.img (loopback image) @@ -13,14 +13,17 @@ # data/root (root's homedir) # # Mark Huang -# Marc E. Fiuczynski -# Copyright (C) 2006-2007 The Trustees of Princeton University +# Copyright (C) 2006 The Trustees of Princeton University # -# $Id: build.sh,v 1.41.2.1 2007/08/30 16:39:08 mef Exp $ +# $Id$ # . build.functions +# pldistro expected as $1 - defaults to planetlab +pldistro=planetlab +[ -n "$@" ] && pldistro=$1 + # 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. @@ -46,7 +49,9 @@ pl_fixdirs root "${datadirs[@]}" echo "* myplc: Installing base filesystem" mkdir -p root data -make_chroot root plc_config.xml + +pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} myplc.pkgs) +pl_root_setup_chroot root -f $pkgsfile # Install configuration scripts echo "* myplc: Installing configuration scripts" @@ -56,6 +61,16 @@ 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 db-config root/usr/bin/db-config install -D -m 755 dns-config root/usr/bin/dns-config +install -D -m 755 plc-map.py root/usr/bin/plc-map.py +install -D -m 755 clean-empty-dirs.py root/usr/bin/clean-empty-dirs.py +install -D -m 755 mtail.py root/usr/bin/mtail.py +install -D -m 755 check-ssl-peering.py root/usr/bin/check-ssl-peering.py +# Extra scripts (mostly for mail and dns) not installed by myplc by default. Used in production +mkdir root/etc/support-scripts +cp support-scripts/* root/etc/support-scripts +# copy initscripts to etc/plc_sliceinitscripts +mkdir root/etc/plc_sliceinitscripts +cp plc_sliceinitscripts/* root/etc/plc_sliceinitscripts # Install initscripts echo "* myplc: Installing initscripts" @@ -63,26 +78,55 @@ 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 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/ - -# Install web pages -echo "* myplc: Installing web pages" -mkdir -p root/var/www/html -rsync -a $srcdir/WWW/ root/var/www/html/ - -# Install Drupal rewrite rules -install -D -m 644 $srcdir/WWW/drupal.conf root/etc/httpd/conf.d/drupal.conf +# fetch the release stamp from the build if any +# I could not come up with any more sensitive scheme +if [ -f ../../../myplc-release ] ; then + cp ../../../myplc-release myplc-release +else + echo "Cannot find release information." > myplc-release + date >> myplc-release + echo "$HeadURL$" >> myplc-release +fi +# install it in /etc/myplc-release +install -m 444 myplc-release root/etc/myplc-release + +### Thierry Parmentelat - april 16 2007 +# fix the yum.conf as produced by mkfedora +# so we can use the build's fc4 mirror for various installs/upgrades +# within the chroot jail +# yum_conf_to_build_host is defined in build.functions +yum_conf_to_build_host > root/etc/yum.conf + +### Thierry Parmentelat - july 20 2007 +# we now build the myplc doc +# beware that making the pdf file somehow overwrites the html +make -C doc myplc.pdf +rm -f doc/myplc.html +make -C doc myplc.html + +# install at the same place as plcapi - better ideas ? +for doc in myplc.html myplc.pdf ; do + install -m 644 doc/$doc root/usr/share/plc_api/doc/$doc +done + +# we now build the plcapi doc +# this generates a drupal php file from a docbook-generated html +# quick & dirty +docbook_html_to_drupal "${pldistro} PLCAPI Documentation" \ + root/usr/share/plc_api/doc/PLCAPI.html \ + root/var/www/html/planetlab/doc/plcapi.php +# pdf just get copied +install -m 644 root/usr/share/plc_api/doc/PLCAPI.pdf root/var/www/html/planetlab/doc/plcapi.pdf + +docbook_html_to_drupal "Myplc User Guide" \ + root/usr/share/plc_api/doc/myplc.html \ + root/var/www/html/planetlab/doc/myplc.php +# pdf just get copied +install -m 644 root/usr/share/plc_api/doc/myplc.pdf root/var/www/html/planetlab/doc/myplc.pdf # Install configuration file echo "* myplc: Installing configuration file" -install -D -m 444 $config data/etc/planetlab/default_config.xml +install -D -m 444 default_config.xml 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 @@ -107,7 +151,7 @@ rm -f data/var/www/html/boot/bootmanager.sh # 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 $pl_YUMGROUPSXML \ +install -D -m 644 $pl_DISTRO_YUMGROUPS \ data/var/www/html/install-rpms/planetlab/yumgroups.xml # Make image out of directory