X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=c0c73dea030359699866ab9d6a023e4de8a2806a;hb=031fafbe79b5cd16cacafe2783db9cc822cb675d;hp=e0325c1be0935466457c1295dce3811127a496bb;hpb=0a1ebbc9589b5ce477606d2e691b8e72303ce671;p=build.git

diff --git a/build.common b/build.common
index e0325c1b..c0c73dea 100644
--- a/build.common
+++ b/build.common
@@ -7,27 +7,12 @@
 # Copyright (C) 2007 The Trustees of Princeton University
 # Thierry Parmentelat <thierry.parmentelat@inria.fr> INRIA
 #
-# supported distros f12 f14 f16 f18 f20 
-# and debians/ubuntus to a lesser extent
+# 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
 
-# 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; }
-	[ -f /vservers/$lxc/rootfs/$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
@@ -35,12 +20,13 @@ function pl_getDistro() {
 	case $distro in Scientific*) distro="SL" ; esac
     elif [ -f /etc/lsb-release ] ; then
 	. /etc/lsb-release
-	echo $DISTRIB_CODENAME 
+	distro=$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 ;;
+	    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; }
@@ -79,7 +65,7 @@ function pl_getReleaseName () {
 	[Ss]L*)
 	    releasename=sl$release
 	    ;;
-	squeeze|wheezy|oneiric|precise|quantal|raring|saucy)
+	wheezy|jessie|precise|trusty|utopic|vivid|wily|xenial)
 	    releasename=$distro
 	    ;;
 	*)
@@ -212,15 +198,15 @@ function pl_root_makedevs() {
     done
 }
 
-function mkfedora_usage() {
+function pl_root_mkfedora_usage() {
     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 " 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
 }
 
@@ -244,17 +230,17 @@ function pl_root_mkfedora () {
     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))
-    [[ "$#" -lt 3 ]] && mkfedora_usage
+    [[ "$#" -lt 3 ]] && pl_root_mkfedora_usage
     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
@@ -401,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 --releasever=$releasever"
 
     # glibc must be specified explicitly for the correct arch to be
     # chosen.
@@ -586,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 "$@" ; }
 
 ##############################
 
@@ -761,3 +750,4 @@ function yumconf_exclude () {
     sed -i -e "/#baseurl=.*$/i\\
 $yumexclude_line" $repo
 }
+