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

diff --git a/build.sh b/build.sh
index 96a9c4f..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 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)
@@ -13,14 +14,16 @@
 # data/root (root's homedir)
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
-# Marc E. Fiuczynski <mef@cs.princeton.edu>
-# 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=$1 ; shift
+
 # 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.
@@ -31,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
@@ -46,7 +50,11 @@ pl_fixdirs root "${datadirs[@]}"
 
 echo "* myplc: Installing base filesystem"
 mkdir -p root data
-make_chroot root plc_config.xml
+
+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"
@@ -56,6 +64,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 +81,32 @@ 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/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
+# 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 ../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"
-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
@@ -104,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_YUMGROUPSXML \
-    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"