git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore .du files
[build.git]
/
build.common
diff --git
a/build.common
b/build.common
index
c11fd45
..
7a09d86
100644
(file)
--- 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
#
# 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
#
# for locating pkgs.py
export PATH=.:$PATH
@@
-17,10
+18,17
@@
function pl_getDistro() {
if [ -f "/etc/redhat-release" ] ; then
distro=$(awk ' { print $1 } ' /etc/redhat-release)
case $distro in Scientific*) distro="SL" ; esac
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
elif [ -f /etc/debian_version ] ; then
- for known in lenny squeeze wheezy jessie; do
- grep -q $known /etc/os-release && distro=$known
- done
+ case $(cat /etc/debian_version) in
+ 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; }
echo "$distro"
fi
[ -z "$distro" ] && { echo "build.common.pl_getDistro-unknown"; exit 1; }
echo "$distro"
@@
-58,7
+66,7
@@
function pl_getReleaseName () {
[Ss]L*)
releasename=sl$release
;;
[Ss]L*)
releasename=sl$release
;;
-
lenny|squeeze|wheezy|jessie
)
+
squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty|utopic
)
releasename=$distro
;;
*)
releasename=$distro
;;
*)
@@
-565,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 "$@" ; }
# 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 "$@" ; }
##############################
##############################