X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.functions;h=c89aab338c8fa00891a90ae147769b6e7a9a5cc3;hb=26ae8f6245f159cf580337a40ae54a39c3025318;hp=faf4b84ac939284c01b2aadfdd40bd4163562a03;hpb=13deafa8992af49ddd78fdf994f0e16ed766bd52;p=myplc.git diff --git a/build.functions b/build.functions index faf4b84..c89aab3 100644 --- a/build.functions +++ b/build.functions @@ -6,7 +6,7 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: build.functions,v 1.2 2006/07/24 19:32:23 mlhuang Exp $ +# $Id: build.functions,v 1.4 2006/08/16 01:27:16 mlhuang Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -29,20 +29,10 @@ PLC_DEVEL_FEDORA_RELEASE=4 PLC_DEVEL_FEDORA_ARCH=i386 # Fedora Core mirror from which to install filesystems -PLC_DEVEL_FEDORA_URL=file:///usr/share/mirrors/fedora - -# Build myplc inside myplc-devel -PLC_DEVEL_BOOTSTRAP=true - -# Source tag to use for initial import of sources into local CVS -IMPORT_TAG=planetlab-$(date +%Y-%m-%d) - -# Source tag to use for building from local CVS -BUILD_TAG=HEAD +PLC_DEVEL_FEDORA_URL=file:///data/fedora # We may be running inside a myplc-devel environment, which can -# override these defaults. Specifically, whether to build myplc inside -# myplc-devel (PLC_DEVEL_BOOTSTRAP). +# override these defaults. if [ -f /etc/planetlab/plc_config ] ; then . /etc/planetlab/plc_config fi @@ -53,13 +43,12 @@ usage() echo " -l url Fedora mirror location (default: $PLC_DEVEL_FEDORA_URL)" echo " -r release Fedora release number (default: $PLC_DEVEL_FEDORA_RELEASE)" echo " -a arch Fedora architecture (default: $PLC_DEVEL_FEDORA_ARCH)" - echo " -t tag Source tag (default: $TAG)" echo " -h This message" exit 1 } # Get options -while getopts "l:r:a:t:h" opt ; do +while getopts "l:r:a:h" opt ; do case $opt in l) PLC_DEVEL_FEDORA_URL=$OPTARG @@ -70,10 +59,6 @@ while getopts "l:r:a:t:h" opt ; do a) PLC_DEVEL_FEDORA_ARCH=$OPTARG ;; - t) - IMPORT_TAG=$OPTARG - BUILD_TAG=$OPTARG - ;; h|*) usage ;;