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
myplc
[build.git]
/
build.common
diff --git
a/build.common
b/build.common
index
228a6ad
..
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
#
# Copyright (C) 2007 The Trustees of Princeton University
# Thierry Parmentelat <thierry.parmentelat@inria.fr> INRIA
#
-# supported distros f8, f1
0, f12, f14, f16
, centos5, sl6
+# supported distros f8, f1
2, f14, f16, f18
, centos5, sl6
#
# for locating pkgs.py
export PATH=.:$PATH
#
# for locating pkgs.py
export PATH=.:$PATH
@@
-17,11
+17,14
@@
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
+ echo $DISTRIB_CODENAME
elif [ -f /etc/debian_version ] ; then
case $(cat /etc/debian_version) in
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.
ub
ild.common ;;
+ 6.
*
) distro=squeeze ;;
+ 7.
*
) distro=wheezy ;;
+ *) distro=unknown.debian.in.
bu
ild.common ;;
esac
fi
[ -z "$distro" ] && { echo "build.common.pl_getDistro-unknown"; exit 1; }
esac
fi
[ -z "$distro" ] && { echo "build.common.pl_getDistro-unknown"; exit 1; }
@@
-60,7
+63,7
@@
function pl_getReleaseName () {
[Ss]L*)
releasename=sl$release
;;
[Ss]L*)
releasename=sl$release
;;
-
lenny|squeeze|wheezy|jessie
)
+
squeeze|wheezy|oneiric|precise|quantal|raring
)
releasename=$distro
;;
*)
releasename=$distro
;;
*)