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
prepare for f23
[build.git]
/
build.common
diff --git
a/build.common
b/build.common
index
228a6ad
..
64c4fe8
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 fedoras, and debians/ubuntus to a lesser extent
+# centos's and scientific linux's have been used too quite a while ago
#
# for locating pkgs.py
export PATH=.:$PATH
#
# for locating pkgs.py
export PATH=.:$PATH
@@
-17,11
+18,15
@@
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
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.ubild.common ;;
+ 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; }
esac
fi
[ -z "$distro" ] && { echo "build.common.pl_getDistro-unknown"; exit 1; }
@@
-60,7
+65,7
@@
function pl_getReleaseName () {
[Ss]L*)
releasename=sl$release
;;
[Ss]L*)
releasename=sl$release
;;
-
lenny|squeeze|wheezy|jessie
)
+
wheezy|jessie|precise|trusty|utopic|vivid|wily
)
releasename=$distro
;;
*)
releasename=$distro
;;
*)
@@
-193,15
+198,15
@@
function pl_root_makedevs() {
done
}
done
}
-function mkfedora_usage() {
+function
pl_root_
mkfedora_usage() {
echo "Usage: pl_root_mkfedora [OPTION]... basedir pldistro pkgsfile(s)"
echo "Usage: pl_root_mkfedora [OPTION]... basedir pldistro pkgsfile(s)"
-
echo "
-l url Fedora mirror location."
- echo " Defaults are searched in <pldistro>.mirrors"
+
# echo "
-l url Fedora mirror location."
+
#
echo " Defaults are searched in <pldistro>.mirrors"
echo " -v Be verbose"
echo " -h This message"
echo " -v Be verbose"
echo " -h This message"
- echo " target selection (defaults based on current build VM context)"
-
echo "
-r release Fedora release number (default: $releasever)"
-
echo "
-a arch Fedora architecture (default: $basearch)"
+
#
echo " target selection (defaults based on current build VM context)"
+
# echo "
-r release Fedora release number (default: $releasever)"
+
# echo "
-a arch Fedora architecture (default: $basearch)"
exit 1
}
exit 1
}
@@
-225,17
+230,17
@@
function pl_root_mkfedora () {
while getopts "vh" opt ; do
case $opt in
v) verbose=1; set -x ;;
while getopts "vh" opt ; do
case $opt in
v) verbose=1; set -x ;;
- h|*) mkfedora_usage ;;
+ h|*)
pl_root_
mkfedora_usage ;;
esac
done
shift $(($OPTIND - 1))
esac
done
shift $(($OPTIND - 1))
- [[ "$#" -lt 3 ]] && mkfedora_usage
+ [[ "$#" -lt 3 ]] &&
pl_root_
mkfedora_usage
vroot=$1 ; shift
pldistro=$1 ; shift
pkgsfile="$@"
vroot=$(cd $vroot && pwd -P)
vroot=$1 ; shift
pldistro=$1 ; shift
pkgsfile="$@"
vroot=$(cd $vroot && pwd -P)
- [ -d $vroot ] || mkfedora_usage
+ [ -d $vroot ] ||
pl_root_
mkfedora_usage
# parse pkgsfile and add to local vars
# parse pkgsfile and add to local vars
@@
-382,6
+387,7
@@
fi
yum_options="$yum_options -y"
yum_options="$yum_options -c $yum_conf"
yum_options="$yum_options --installroot=$vroot"
yum_options="$yum_options -y"
yum_options="$yum_options -c $yum_conf"
yum_options="$yum_options --installroot=$vroot"
+ yum_options="$yum_options --releasever=$releasever"
# glibc must be specified explicitly for the correct arch to be
# chosen.
# glibc must be specified explicitly for the correct arch to be
# chosen.
@@
-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 "$@" ; }
# 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 "$@" ; }
##############################
##############################
@@
-742,3
+750,4
@@
function yumconf_exclude () {
sed -i -e "/#baseurl=.*$/i\\
$yumexclude_line" $repo
}
sed -i -e "/#baseurl=.*$/i\\
$yumexclude_line" $repo
}
+