From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 29 Nov 2007 15:08:42 +0000 (+0000)
Subject: minimal fix for building myplc-native
X-Git-Tag: myplc-4.0-15~31
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=475825699b05616da35d2cdb045e3bfb0da6dddf;p=myplc.git

minimal fix for building myplc-native
---

diff --git a/build-native.sh b/build-native.sh
index 461b06a..6e6b7ae 100755
--- a/build-native.sh
+++ b/build-native.sh
@@ -26,40 +26,33 @@ install -D -m 755 plc-config ${tmpdir}/usr/bin/plc-config
 install -D -m 755 plc-config-tty ${tmpdir}/usr/bin/plc-config-tty
 install -D -m 755 db-config ${tmpdir}/usr/bin/db-config
 install -D -m 755 dns-config ${tmpdir}/usr/bin/dns-config
-echo "* myplc-native: skipping build/install of plc_config.py"
+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
 
+echo "* myplc-native: skipping build/install of plc_config.py"
 # XXX needs to be done by %pre script in .spec file
 # install -D -m 755 plc_config.py /tmp/plc_config.py
 # sh -c 'cd ${tmpdir}; python plc_config.py build; python plc_config.py install'
 # XXX needs to be done by %pre script in .spec file
 # sh -c 'chkconfig --add plc; chkconfig plc on'
 
-
-
 # Install initscripts
 echo "* myplc-native: Installing initscripts"
 find plc.d | cpio -p -d -u ${tmpdir}/etc/
 install -D -m 755 guest.init ${tmpdir}/etc/init.d/plc
 
 
-# Install web scripts
-#echo "* myplc: Installing web scripts"
-#mkdir -p ${tmpdir}/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 \
-#    ${tmpdir}/usr/bin/
-
 # Install configuration file
 echo "* myplc: Installing configuration file"
-install -D -m 444 plc_config.xml ${tmpdir}/etc/planetlab/default_config.xml
+install -D -m 444 default_config.xml ${tmpdir}/etc/planetlab/default_config.xml
 install -D -m 444 plc_config.dtd ${tmpdir}/etc/planetlab/plc_config.dtd
 
 # 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 \
     ${tmpdir}/var/www/html/install-rpms/planetlab/yumgroups.xml
 
 exit 0
diff --git a/build.sh b/build.sh
index e7d546d..87f3bf6 100755
--- a/build.sh
+++ b/build.sh
@@ -72,32 +72,12 @@ 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 ../../../myplc-release ] ; then
   cp ../../../myplc-release myplc-release
 else
-  echo "No build information found in ../.." > myplc-release
+  echo "No build release information found" > myplc-release
 fi
 # install it in /etc/myplc-release 
 install -m 444 myplc-release root/etc/myplc-release