cleanup myplc

diff --git a/bootstrap.xml b/bootstrap.xml
deleted file mode 100644 (file)
index b88e816..0000000
--- a/bootstrap.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE configuration PUBLIC "-//PlanetLab Central//DTD PLC configuration//EN" "configuration.dtd">
-
-<configuration>
-
-  <!-- This overlay configuration file changes the DB, web, API, and
-       boot server ports to (hopefully unused) ports so that the
-       system can be bootstrapped on a build machine that may itself
-       be running such servers. -->
-
-  <variables>
-    <category id="plc_db">
-      <variablelist>
-       <variable id="port" type="int">
-         <value>15432</value>
-       </variable>
-      </variablelist>
-    </category>
-
-    <category id="plc_api">
-      <variablelist>
-       <variable id="port" type="int">
-         <value>10080</value>
-       </variable>
-      </variablelist>
-    </category>
-
-    <category id="plc_www">
-      <variablelist>
-       <variable id="port" type="int">
-         <value>10080</value>
-       </variable>
-
-       <variable id="ssl_port" type="int">
-         <value>10443</value>
-       </variable>
-      </variablelist>
-    </category>
-
-    <category id="plc_boot">
-      <variablelist>
-       <variable id="port" type="int">
-         <value>10080</value>
-       </variable>
-
-       <variable id="ssl_port" type="int">
-         <value>10443</value>
-       </variable>
-      </variablelist>
-    </category>
-  </variables>
-
-</configuration>

diff --git a/build.functions b/build.functions
deleted file mode 100644 (file)
index a96e295..0000000
--- a/build.functions
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*-Shell-script-*-
-#
-# Common functions for MyPLC build scripts (build_devel.sh and
-# build.sh)
-#
-# Mark Huang <mlhuang@cs.princeton.edu>
-# Copyright (C) 2006 The Trustees of Princeton University
-#
-# $Id$
-#
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-# In both a normal CVS environment and a PlanetLab RPM
-# build environment, all of our dependencies are checked out into
-# directories at the same level as us.
-if [ -d ../build ] ; then
-    PATH=$PATH:../build
-    srcdir=..
-else
-    echo "Error: Could not find $(cd .. && pwd -P)/build/"
-    exit 1
-fi
-
-export PATH
-
-. build.common
-
-pl_process_fedora_options $@
-shiftcount=$?
-shift $shiftcount
-
-# XXX Backwards compatibility with old myplc-devel environment
-# We may be running inside a myplc-devel environment, which can
-# override these defaults.
-if [ -f /etc/planetlab/plc_config ] ; then
-    . /etc/planetlab/plc_config
-    [ ! -z "$PLC_DEVEL_FEDORA_RELEASE" ] && pl_FEDORA_RELEASE=$PLC_DEVEL_FEDORA_RELEASE
-    [ ! -z "$PLC_DEVEL_FEDORA_ARCH" ] && pl_FEDORA_ARCH=$PLC_DEVEL_FEDORA_ARCH
-    [ ! -z "$PLC_DEVEL_FEDORA_URL" ] && pl_FEDORA_URL=$PLC_DEVEL_FEDORA_URL
-fi
-
-# Do not tolerate errors
-set -e
-
-# Be verbose
-set -x
-
-# this is fragile, as the actual layout may vary from one mirror to the other
-# however this should be in line with the layouts obtained 
-# when running build/vbuild-fedora-mirror.sh
-
-function yum_conf_to_build_host () {
-    build_dir=$1; shift
-    BUILD_HOST=$(hostname)
-
-    cat <<EOF
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-logfile=/var/log/yum.log
-pkgpolicy=newest
-distroverpkg=redhat-release
-tolerant=1
-exactarch=1
-retries=10
-obsoletes=1
-gpgcheck=0
-# Prevent yum-2.4 from loading additional repository definitions
-# (e.g., from /etc/yum.repos.d/)
-reposdir=/dev/null
-
-EOF
-
-    template=$build_dir/mirroring/${pl_DISTRO_NAME}/yum.repos.d/building.repo.in
-    if [ ! -f $template ] ; then
-       echo "# MyPLC/$0: cannot find template $template"
-    else
-       sed -e s,@MIRRORURL@,http://${BUILD_HOST}/mirror/, $template
-    fi
-}
-

diff --git a/build.sh b/build.sh
deleted file mode 100755 (executable)
index 30304c3..0000000
--- a/build.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/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).
-#
-# Marc E. Fiuczynski <mef@cs.princeton.edu>
-# Copyright (C) 2007 The Trustees of Princeton University
-#
-# $Id$
-#
-
-. build.functions
-
-# Install configuration scripts
-echo "* Installing configuration scripts"
-pldistro=$1; shift
-RPM_BUILD_ROOT=$1 ; shift
-PYTHON_SITEARCH=`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}
-
-echo "* Installing plc_config.py in " ${PYTHON_SITEARCH}
-install -D -m 755 plc_config.py ${RPM_BUILD_ROOT}/${PYTHON_SITEARCH}/plc_config.py
-
-echo "* Installing scripts in /usr/bin"
-mkdir -p ${RPM_BUILD_ROOT}/usr/bin
-rsync -av --exclude .svn bin/ ${RPM_BUILD_ROOT}/usr/bin/
-chmod 755 ${RPM_BUILD_ROOT}/usr/bin/*
-
-# Install initscript 
-echo "* Installing plc initscript"
-install -D -m 755 plc.init ${RPM_BUILD_ROOT}/etc/init.d/plc
-
-# Install initscripts
-echo "* Installing plc.d initscripts"
-find plc.d | cpio -p -d -u ${RPM_BUILD_ROOT}/etc/
-chmod 755 ${RPM_BUILD_ROOT}/etc/plc.d/*
-
-# Install db-config.d files
-echo "* Installing db-config.d files"
-mkdir -p ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d
-cp db-config.d/* ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d
-chmod 444 ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d/*
-
-# Extra scripts (mostly for mail and dns) not installed by myplc by default.  Used in production
-echo "* Installing scripts in /etc/support-scripts"
-mkdir -p ${RPM_BUILD_ROOT}/etc/support-scripts
-cp support-scripts/* ${RPM_BUILD_ROOT}/etc/support-scripts
-chmod 444 ${RPM_BUILD_ROOT}/etc/support-scripts/*
-
-# copy initscripts to etc/plc_sliceinitscripts
-mkdir -p ${RPM_BUILD_ROOT}/etc/plc_sliceinitscripts
-cp plc_sliceinitscripts/* ${RPM_BUILD_ROOT}/etc/plc_sliceinitscripts
-chmod 444 ${RPM_BUILD_ROOT}/etc/plc_sliceinitscripts/*
-
-# Install configuration file
-echo "* myplc: Installing configuration file"
-install -D -m 444 default_config.xml ${RPM_BUILD_ROOT}/etc/planetlab/default_config.xml
-install -D -m 444 plc_config.dtd ${RPM_BUILD_ROOT}/etc/planetlab/plc_config.dtd
-
-echo "* Installing bashrc convenience"
-install -D -m 644 bashrc ${RPM_BUILD_ROOT}/usr/share/myplc/bashrc
-
-# yumgroups.xml and yum repo : let noderepo handle that
-
-exit 0

diff --git a/myplc.spec b/myplc.spec
index 26b69aa..f62b235 100644 (file)
--- a/myplc.spec
+++ b/myplc.spec
@@ -102,10 +102,53 @@ This package provides the Python module to configure MyPLC.
 %build
 
 %install
-pushd MyPLC
 rm -rf $RPM_BUILD_ROOT
-./build.sh %{pldistro} $RPM_BUILD_ROOT
-popd
+
+# Install configuration scripts
+echo "* Installing plc_config.py in " ${PYTHON_SITEARCH}
+PYTHON_SITEARCH=`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
+install -D -m 755 plc_config.py ${RPM_BUILD_ROOT}/${PYTHON_SITEARCH}/plc_config.py
+
+echo "* Installing scripts in /usr/bin"
+mkdir -p ${RPM_BUILD_ROOT}/usr/bin
+rsync -av --exclude .svn bin/ ${RPM_BUILD_ROOT}/usr/bin/
+chmod 755 ${RPM_BUILD_ROOT}/usr/bin/*
+
+# Install initscript 
+echo "* Installing plc initscript"
+install -D -m 755 plc.init ${RPM_BUILD_ROOT}/etc/init.d/plc
+
+# Install initscripts
+echo "* Installing plc.d initscripts"
+find plc.d | cpio -p -d -u ${RPM_BUILD_ROOT}/etc/
+chmod 755 ${RPM_BUILD_ROOT}/etc/plc.d/*
+
+# Install db-config.d files
+echo "* Installing db-config.d files"
+mkdir -p ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d
+cp db-config.d/* ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d
+chmod 444 ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d/*
+
+# Extra scripts (mostly for mail and dns) not installed by myplc by default.  Used in production
+echo "* Installing scripts in /etc/support-scripts"
+mkdir -p ${RPM_BUILD_ROOT}/etc/support-scripts
+cp support-scripts/* ${RPM_BUILD_ROOT}/etc/support-scripts
+chmod 444 ${RPM_BUILD_ROOT}/etc/support-scripts/*
+
+# copy initscripts to etc/plc_sliceinitscripts
+mkdir -p ${RPM_BUILD_ROOT}/etc/plc_sliceinitscripts
+cp plc_sliceinitscripts/* ${RPM_BUILD_ROOT}/etc/plc_sliceinitscripts
+chmod 444 ${RPM_BUILD_ROOT}/etc/plc_sliceinitscripts/*
+
+# Install configuration file
+echo "* myplc: Installing configuration file"
+install -D -m 444 default_config.xml ${RPM_BUILD_ROOT}/etc/planetlab/default_config.xml
+install -D -m 444 plc_config.dtd ${RPM_BUILD_ROOT}/etc/planetlab/plc_config.dtd
+
+echo "* Installing bashrc convenience"
+install -D -m 644 bashrc ${RPM_BUILD_ROOT}/usr/share/myplc/bashrc
+
+# yumgroups.xml and yum repo : let noderepo handle that
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -181,20 +224,9 @@ fi
 /etc/init.d/plc
 /etc/plc.d
 /etc/planetlab
-/etc/plc_sliceinitscripts/sirius
-/etc/support-scripts/gen_aliases.py*
-/etc/support-scripts/renew_reminder.py*
-/etc/support-scripts/renew_reminder_logrotate
-/usr/bin/plc-config-tty
-/usr/bin/db-config
-/usr/bin/dns-config
-/usr/bin/plc-map.py*
-/usr/bin/plc-kml.py*
-/usr/bin/refresh-peer.py*
-/usr/bin/clean-empty-dirs.py*
-/usr/bin/mtail.py*
-/usr/bin/plc-check-ssl-peering.py*
-/usr/bin/plc-orphan-accounts.py*
+/etc/plc_sliceinitscripts
+/etc/support-scripts
+/usr/bin/
 /usr/share/myplc/bashrc
 
 %files config
@@ -299,7 +331,7 @@ fi
 - - Fix /etc/init.d/plc to have command usage show up on the tty rather
 - than the log file
 - - Fix db-config to be a bit more cautious when
-- /etc/planetlab/db-config.d doesn't exist
+- /etc/planetlab/db-config.d doesn''t exist
 - - Clean up db-config approach to ignore .bak, *~, .rpm{save,new}, and
 - .orig files.
 - - Refactor generic plc-config-tty code into plc_config.py.