Make Fedora 7 compatible

[myplc.git] / build.functions

diff --git a/build.functions b/build.functions
index e762341..965a880 100644 (file)
--- a/build.functions
+++ b/build.functions
@@ -6,7 +6,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: build.functions,v 1.1 2006/07/17 21:31:31 mlhuang Exp $
+# $Id: build.functions,v 1.6 2007/08/16 21:42:02 mef Exp $
 #
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -25,21 +25,13 @@ fi
 export PATH
 
 # Release and architecture to install
-PLC_DEVEL_FEDORA_RELEASE=4
-PLC_DEVEL_FEDORA_ARCH=i386
-
+PLC_DEVEL_FEDORA_RELEASE=$([ -f "/etc/fedora-release" ] && awk ' { if ($3=="Core") print $4; else print $3 } ' /etc/fedora-release || echo 4)
+PLC_DEVEL_FEDORA_ARCH=$(uname -i)
 # 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
-TAG=planetlab-$(date +%Y-%m-%d)
+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
@@ -50,13 +42,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
@@ -67,9 +58,6 @@ while getopts "l:r:a:t:h" opt ; do
        a)
            PLC_DEVEL_FEDORA_ARCH=$OPTARG
            ;;
-       t)
-           TAG=$OPTARG
-           ;;
        h|*)
            usage
            ;;