X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=dc003830309299144382defac93848a7a130f2a5;hb=refs%2Fheads%2F4.2;hp=a43f3f0466f1884ed07d934f00abb654fe84508b;hpb=effaa2138be88157b2322de42fe9395694918acf;p=myplc.git

diff --git a/build.sh b/build.sh
index a43f3f0..dc00383 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 #
-# 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).
+# Builds MyPLC in the current host environment
+# This is for the so-called chroot installation mode, meaning that
+# the resulting rpm will install a full chroot image in /plc/root
+# that can be run through chroot /plc/root
+# This chroot mode is to be opposed to the native mode (see build-native.sh)
+# that can be used in the host's root context or within a vserver
 #
 # root.img (loopback image)
 # root/ (mount point)
@@ -21,8 +22,7 @@
 . build.functions
 
 # pldistro expected as $1 - defaults to planetlab
-pldistro=planetlab
-[ -n "$@" ] && pldistro=$1
+pldistro=$1 ; shift
 
 # These directories are allowed to grow to unspecified size, so they
 # are stored as symlinks to the /data partition. mkfedora and yum
@@ -34,6 +34,7 @@ datadirs=(
 /var/www/html/alpina-logs
 /var/www/html/boot
 /var/www/html/download
+/var/www/html/download-planetlab-i386
 /var/www/html/files
 /var/www/html/sites
 /var/www/html/generated
@@ -50,8 +51,10 @@ pl_fixdirs root "${datadirs[@]}"
 echo "* myplc: Installing base filesystem"
 mkdir -p root data
 
-lst=${pldistro}-${pl_DISTRO_NAME}-plc.lst
-make_chroot_from_lst root $lst
+pl_root_makedevs root
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} myplc.pkgs)
+pl_root_mkfedora root $pldistro $pkgsfile
+pl_root_tune_image root
 
 # Install configuration scripts
 echo "* myplc: Installing configuration scripts"
@@ -65,6 +68,12 @@ 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"
@@ -72,32 +81,14 @@ 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/
-
-### Thierry Parmentelat - april 16 2007
-### from now on we package plcwww separately in the plcwww rpm
-#### Install web pages
-###echo "* myplc: Installing web pages"
-###mkdir -p root/var/www/html
-###rsync -a $srcdir/new_plc_www/ root/var/www/html/
-
-#### Install Drupal rewrite rules
-###install -D -m 644 $srcdir/new_plc_www/drupal.conf root/etc/httpd/conf.d/drupal.conf
-
-### Thierry Parmentelat - april 16 2007
 # fetch the release stamp from the build if any
 # I could not come up with any more sensitive scheme 
-if [ -f ../../../SOURCES/myplc-release ] ; then
-  cp ../../../SOURCES/myplc-release myplc-release
+if [ -f ../../../myplc-release ] ; then
+  cp ../../../myplc-release myplc-release
 else
-  echo "No build information found in ../.." > myplc-release
+  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
@@ -107,41 +98,11 @@ install -m 444 myplc-release root/etc/myplc-release
 # 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 - may 16 2007
-# the node-dependent image generation script requires root privilege
-# to perform various mount operations
-sudoers_bootcustom_apache > root/etc/sudoers
-chown root:root root/etc/sudoers
-chmod 400 root/etc/sudoers
-
-### 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 "OneLab 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
+yum_conf_to_build_host ../build > root/etc/yum.conf
+
+### Thierry Parmentelat - may 8 2008
+# no doc built in this old-fashioned packaging anymore
+# use myplc-docs instead
 
 # Install configuration file
 echo "* myplc: Installing configuration file"
@@ -167,11 +128,7 @@ pl_fixtmp_permissions data
 # Remove generated bootmanager script
 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_DISTRO_YUMGROUPS \
-    data/var/www/html/install-rpms/planetlab/yumgroups.xml
+# yumgroups.xml and yum repo : let noderepo handle that
 
 # Make image out of directory
 echo "* myplc: Building loopback image"