repair logic, we were creating lcxroot before checking it was non-existent

[build.git] / build.common

diff --git a/build.common b/build.common
index 95990ce..7acfbb3 100644 (file)
--- a/build.common
+++ b/build.common
@@ -7,20 +7,42 @@
 # 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 f12 f14 f16 f18 f20 
+# and debians/ubuntus to a lesser extent
 #
 # for locating pkgs.py
 export PATH=.:$PATH
 
+# old guests have e.g. mount in /bin but this is no longer part of 
+# the standard PATH in recent hosts after usrmove, so let's keep it simple
+export PATH=$PATH:/bin:/sbin
+
+# would be much simpler if enter-lxc-namespace was looking along a PATH...
+function bin_in_container () {
+    lxc=$1; shift
+    binary=$1; shift
+    for path in $(echo $PATH | sed -e 's,:, ,g' ); do
+       [ -f /vservers/$lxc/$path/$binary ] && { echo $path/$binary; return; }
+    done
+    echo bin_in_container_cannot_find_$binary
+}
+
 # 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 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 +78,9 @@ function pl_getReleaseName () {
        [Ss]L*)
            releasename=sl$release
            ;;
+       squeeze|wheezy|oneiric|precise|quantal|raring|saucy)
+           releasename=$distro
+           ;;
        *)
            releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common"
            echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" 
@@ -576,7 +601,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