vserverreference renamed to vserver-reference

[build.git] / build.common

diff --git a/build.common b/build.common
index 74683c4..ff5c104 100644 (file)
--- a/build.common
+++ b/build.common
@@ -11,10 +11,14 @@
 #
 # supported distros f8, f10, f12, centos5
 #
+# for locating pkgs.py
+export PATH=.:$PATH
+
 # returns 'Fedora' or 'CentOS' for now
 function pl_getDistro() {
     if [ -f "/etc/redhat-release" ] ; then
        distro=$(awk ' { print $1 } ' /etc/redhat-release)
+       case $distro in Red*) distro="Redhat" ; esac
     else
        echo "build.common.pl_getDistro-unknown"
        exit 1
@@ -26,12 +30,13 @@ function pl_getDistro() {
 # returns something like 8, 10, or 5.3
 function pl_getRelease() {
     if [ -f "/etc/redhat-release" ] ; then
-       release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 } ' /etc/redhat-release)
+       release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 ; if ($1=="Red") print $6 } ' /etc/redhat-release)
     else
        echo "build.common.pl_getRelease-unknown"
        exit 1
     fi
-    echo "$release"
+    # keep only the major number
+    echo "$release" | cut -d. -f1
     return 0
 }
 
@@ -43,6 +48,9 @@ function pl_getReleaseName () {
        [Ff]edora*)
            releasename=f$release
            ;;
+       [Re]edhat*)
+           releasename=rhel6
+           ;;
        [Cc]entOS*)
            old_IFS="$IFS"
            IFS="."
@@ -508,7 +516,7 @@ function pl_fixdirs() {
 
 ########## .pkgs format
 # Usage: pl_parsePkgs keyword [-a arch] fcdistro pldistro pkgs-file[..s]
-# pkgs.py sohuld be found in PATH, like this file build.common
+# pkgs.py should be found in PATH, like this file build.common
 function pl_parsePkgs () {
     target_arch=$pl_DISTRO_ARCH
     keyword=$1;shift
@@ -571,10 +579,13 @@ function pl_locateDistroFile () {
     pkgsfile=$1; shift
 
     pkgspath=""
-    # if config dir is missing but a .svnpath exists
-    if [[ -f "$builddir/config.${pldistro}.svnpath" && ! -d "$builddir/config.${pldistro}" ]] ; then
-       echo 1>&2 "Invoking make to extract remote config.${pldistro}"
-       make 1>&2 --silent --no-print-directory -C $builddir stage1=true config.${pldistro}
+    # if config dir is missing but a .svnpath or a .gitpath exists, use it to extract the config dir
+    configdir="$builddir/config.${pldistro}"
+    if [ ! -d $configdir ] ; then
+       if [ -f "${configdir}.svnpath" -o -f "${configdir}.gitpath" ] ; then
+           echo 1>&2 "Invoking make to extract remote config.${pldistro}"
+           make 1>&2 --silent --no-print-directory -C $builddir stage1=true config.${pldistro}
+       fi
     fi
     # locate it
     paths="$builddir/config.$pldistro/$pkgsfile $builddir/config.planetlab/$pkgsfile"
@@ -727,6 +738,6 @@ function yumconf_exclude () {
     repo=$1; shift
     kexclude_line="$1" ; shift
     
-    sed -i -e "/baseurl=.*$/i\\
+    sed -i -e "/#baseurl=.*$/i\\
 $kexclude_line" $repo
 }