X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=ff5c104d769f875d82877560ccb64912202ea54b;hb=b6fcf9462d319a79b3f696320d3db80f6f3bc244;hp=172cee25ca51a1fa9b87326f79265822e8d4a398;hpb=6b90efd88093c9dd55453f22884e066be5377c51;p=build.git

diff --git a/build.common b/build.common
index 172cee25..ff5c104d 100644
--- a/build.common
+++ b/build.common
@@ -18,6 +18,7 @@ export PATH=.:$PATH
 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
@@ -29,7 +30,7 @@ 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
@@ -47,6 +48,9 @@ function pl_getReleaseName () {
 	[Ff]edora*)
 	    releasename=f$release
 	    ;;
+	[Re]edhat*)
+	    releasename=rhel6
+	    ;;
 	[Cc]entOS*)
 	    old_IFS="$IFS"
 	    IFS="."
@@ -575,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"