X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=350f662c12e9d00a9f887736de67eef5a7993fcd;hb=refs%2Fheads%2Fnm-one-spec;hp=228a6ad253924d6fb01efcc3f80f436417daf93d;hpb=e1e312e79829c870fc9f79f832170f848a508494;p=build.git

diff --git a/build.common b/build.common
index 228a6ad2..350f662c 100644
--- a/build.common
+++ b/build.common
@@ -7,7 +7,8 @@
 # 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
@@ -17,11 +18,16 @@ function pl_getDistro() {
     if [ -f "/etc/redhat-release" ] ; then
 	distro=$(awk ' { print $1 } ' /etc/redhat-release)
 	case $distro in Scientific*) distro="SL" ; esac
+    elif [ -f /etc/lsb-release ] ; then
+	. /etc/lsb-release
+	distro=$DISTRIB_CODENAME 
     elif [ -f /etc/debian_version ] ; then
 	case $(cat /etc/debian_version) in
-	    6.0.6) distro=squeeze ;;
-	    7.0)   distro=wheezy  ;;
-	    *)	   distro=unknown.debian.in.ubild.common ;;
+	    6.*) distro=squeeze ;;
+	    7.*) distro=wheezy  ;;
+	    # might be that I'm getting 'jessie'sid' just because it's still testing..
+	    8.*|jessie*) distro=jessie  ;;
+	    *)	 distro=unknown.debian.in.build.common ;;
 	esac
     fi
     [ -z "$distro" ] && { echo "build.common.pl_getDistro-unknown"; exit 1; }
@@ -60,7 +66,7 @@ function pl_getReleaseName () {
 	[Ss]L*)
 	    releasename=sl$release
 	    ;;
-	lenny|squeeze|wheezy|jessie)
+	squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty)
 	    releasename=$distro
 	    ;;
 	*)
@@ -567,6 +573,8 @@ function pl_parsePkgs () {
 # usage: pl_getPackages [-a arch] fcdistro pldistro pkg-file[..s]
 function pl_getPackages() { pl_parsePkgs package "$@" ; }
 function pl_getGroups() { pl_parsePkgs group "$@" ; }
+function pl_getPips() { pl_parsePkgs pip "$@" ; }
+function pl_getGems() { pl_parsePkgs gem "$@" ; }
 
 ##############################