DIE PROPER DIE\!

[myplc.git] / build.sh

diff --git a/build.sh b/build.sh
index a10ac88..dc00383 100755 (executable)
--- 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
 
+pl_root_makedevs root
 pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} myplc.pkgs)
-pl_root_setup_chroot root -f $pkgsfile
+pl_root_mkfedora root $pldistro $pkgsfile
+pl_root_tune_image root
 
 # Install configuration scripts
 echo "* myplc: Installing configuration scripts"
@@ -69,8 +72,8 @@ install -D -m 755 check-ssl-peering.py root/usr/bin/check-ssl-peering.py
 mkdir root/etc/support-scripts
 cp support-scripts/* root/etc/support-scripts 
 # copy initscripts to etc/plc_sliceinitscripts
-mkdir etc/plc_sliceinitscripts
-cp plc_sliceinitscripts/* etc/plc_sliceinitscripts
+mkdir root/etc/plc_sliceinitscripts
+cp plc_sliceinitscripts/* root/etc/plc_sliceinitscripts
 
 # Install initscripts
 echo "* myplc: Installing initscripts"
@@ -95,34 +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 - 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
+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"
@@ -148,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"