tests git-path points on master

[build.git] / build.common

diff --git a/build.common b/build.common
index 10741f6..53371c0 100644 (file)
--- a/build.common
+++ b/build.common
@@ -7,7 +7,7 @@
 # Copyright (C) 2007 The Trustees of Princeton University
 # Thierry Parmentelat <thierry.parmentelat@inria.fr> INRIA
 #
-# supported distros f8, f10, f12, f14, f16, centos5, sl6
+# supported distros f8, f12, f14, f16, f18, centos5, sl6
 #
 # for locating pkgs.py
 export PATH=.:$PATH
@@ -17,10 +17,17 @@ function pl_getDistro() {
     if [ -f "/etc/redhat-release" ] ; then
        distro=$(awk ' { print $1 } ' /etc/redhat-release)
        case $distro in Scientific*) distro="SL" ; esac
-    else
-       echo "build.common.pl_getDistro-unknown"
-       exit 1
+    elif [ -f /etc/lsb-release ] ; then
+       . /etc/lsb-release
+       echo $DISTRIB_CODENAME 
+    elif [ -f /etc/debian_version ] ; then
+       case $(cat /etc/debian_version) in
+           6.*) distro=squeeze ;;
+           7.*)   distro=wheezy  ;;
+           *)     distro=unknown.debian.in.build.common ;;
+       esac
     fi
+    [ -z "$distro" ] && { echo "build.common.pl_getDistro-unknown"; exit 1; }
     echo "$distro"
     return 0
 }
@@ -56,6 +63,9 @@ function pl_getReleaseName () {
        [Ss]L*)
            releasename=sl$release
            ;;
+       squeeze|wheezy|oneiric|precise|quantal|raring)
+           releasename=$distro
+           ;;
        *)
            releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common"
            echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" 
@@ -80,7 +90,7 @@ function pl_yumexclude () {
     type -p pkgs.py >& /dev/null || export PATH=$builddir:$PATH
 
     # parse it
-    pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -p $pldistro $keyword $yumexclude_file || \
+    pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro $keyword $yumexclude_file || \
        { echo pl_yumexclude failed with fcdistro=$fcdistro and pldistro=$pldistro; return 1 ; }
 }
 
@@ -233,23 +243,23 @@ function pl_root_mkfedora () {
 
     # parse pkgsfile and add to local vars
     fcdistro=${pl_DISTRO_NAME}
-    pkgs_packages=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -p $pldistro package $pkgsfile) 
-    pkgs_groups=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -p $pldistro group $pkgsfile)
+    pkgs_packages=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro package $pkgsfile) 
+    pkgs_groups=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro group $pkgsfile)
     # what can get trashed to save space
-    pkgs_junk=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -p $pldistro junk $pkgsfile)
+    pkgs_junk=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro junk $pkgsfile)
     # but not this
-    pkgs_precious=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -p $pldistro precious $pkgsfile)
+    pkgs_precious=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro precious $pkgsfile)
     # formerly related to mkfedora -k : packages to take from our own build 
     # and thus need be excluded frem the stock repos
     # locate builddir by looking for pkgs.py
     builddir=$(dirname $(type -p pkgs.py))
     SUBST_NODEYUMEXCLUDE=$(pl_nodeyumexclude $fcdistro $pldistro $builddir)
-    pkgs_yumexclude=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -p $pldistro yumexclude $pkgsfile | sed -e s,@NODEYUMEXCLUDE@,"$SUBST_NODEYUMEXCLUDE",)
+    pkgs_yumexclude=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro yumexclude $pkgsfile | sed -e s,@NODEYUMEXCLUDE@,"$SUBST_NODEYUMEXCLUDE",)
     # get mirrors if not specified with -l
     if [ -z "$mirrors" ] ; then
        mirrorsfile=$(pl_locateDistroFile ../build/ $pldistro "$pldistro.mirrors")
        # do not sort mirrors, keep order from input
-       mirrors=$(pkgs.py -u -a $pl_DISTRO_ARCH -f $fcdistro -p $pldistro mirror $mirrorsfile)
+       mirrors=$(pkgs.py -u -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro mirror $mirrorsfile)
     fi
 
     yumexclude_line=""
@@ -576,7 +586,11 @@ function pl_locateDistroFile () {
     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}
+           # we set PLDISTROTAGS here to /dev/null because when dealing with remote distros
+           # at a very early stage (like searching for devel.pkgs even before the build VM is created)
+           # then make screams because it cannot find a mandatory include file
+           # OTOH this mechanism here is not intended to depend on tags specifically
+           make 1>&2 --no-print-directory -C $builddir stage1=true config.${pldistro} PLDISTROTAGS=/dev/null
        fi
     fi
     # locate it