X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=89540ed2e72e1ba99d299dbd6f45dabeb6b26891;hb=475280879b83f1d9f5c7bec73653cd9d3e41a769;hp=071a96580edb1bfce4721cad8fed7d87c878614a;hpb=e5b6b489890388a37fb0cbedb349dd6b65b46a6d;p=build.git

diff --git a/build.common b/build.common
index 071a9658..89540ed2 100644
--- 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
 #
-# supported distros f12 f14 f16 f18 f20 
+# supported distros f12 f14 f16 f18 f20 f21 f22
 # and debians/ubuntus to a lesser extent
 #
 # for locating pkgs.py
@@ -20,7 +20,7 @@ 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 ;;
@@ -66,7 +66,7 @@ function pl_getReleaseName () {
 	[Ss]L*)
 	    releasename=sl$release
 	    ;;
-	squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty)
+	squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid)
 	    releasename=$distro
 	    ;;
 	*)
@@ -199,15 +199,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
 }
 
@@ -231,17 +231,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
@@ -388,6 +388,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.
@@ -750,3 +751,4 @@ function yumconf_exclude () {
     sed -i -e "/#baseurl=.*$/i\\
 $yumexclude_line" $repo
 }
+