add vim-minimal as requirement of myplc-native

[myplc.git] / build.sh

diff --git a/build.sh b/build.sh
index 4cb08f4..ffedd41 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -97,34 +97,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"
@@ -150,14 +127,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.
-nodefamily=${pldistro}-${pl_DISTRO_ARCH}
-install -D -m 644 $pl_DISTRO_YUMGROUPS \
-    data/var/www/html/install-rpms/$nodefamily/yumgroups.xml
-# temporary - so that node update still work until yum.conf.php gets fixed
-( cd data/var/www/html/install-rpms ; ln -s $nodefamily planetlab)
+# yumgroups.xml and yum repo : let noderepo handle that
 
 # Make image out of directory
 echo "* myplc: Building loopback image"