X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=c0c73dea030359699866ab9d6a023e4de8a2806a;hb=29b8be0319fa74602c28ba270f2b61e98d8a925d;hp=a21d7093458da253e5788991ef4254b859ab65bc;hpb=ac2f5776f95568432bd1d8c8e10d17b667582b98;p=build.git diff --git a/build.common b/build.common index a21d7093..c0c73dea 100644 --- a/build.common +++ b/build.common @@ -7,7 +7,8 @@ # Copyright (C) 2007 The Trustees of Princeton University # Thierry Parmentelat 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 @@ -17,10 +18,18 @@ function pl_getDistro() { if [ -f "/etc/redhat-release" ] ; then distro=$(awk ' { print $1 } ' /etc/redhat-release) case $distro in Scientific*) distro="SL" ; esac - else - echo "build.common.pl_getDistro-unknown" - exit 1 + elif [ -f /etc/lsb-release ] ; then + . /etc/lsb-release + distro=$DISTRIB_CODENAME + elif [ -f /etc/debian_version ] ; then + case $(cat /etc/debian_version) in + 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" return 0 } @@ -56,6 +65,9 @@ function pl_getReleaseName () { [Ss]L*) releasename=sl$release ;; + wheezy|jessie|precise|trusty|utopic|vivid|wily|xenial) + releasename=$distro + ;; *) releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common" echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" @@ -80,7 +92,7 @@ function pl_yumexclude () { type -p pkgs.py >& /dev/null || export PATH=$builddir:$PATH # parse it - pl_parsePkgs $keyword $fcdistro $pldistro $yumexclude_file || \ + pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro $keyword $yumexclude_file || \ { echo pl_yumexclude failed with fcdistro=$fcdistro and pldistro=$pldistro; return 1 ; } } @@ -186,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 .mirrors" +# echo " -l url Fedora mirror location." +# echo " Defaults are searched in .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 } @@ -218,37 +230,38 @@ 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 fcdistro=${pl_DISTRO_NAME} - pkgs_packages=$(pl_parsePkgs package $fcdistro $pldistro $pkgsfile) - pkgs_groups=$(pl_parsePkgs group $fcdistro $pldistro $pkgsfile) + pkgs_packages=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro package $pkgsfile) + pkgs_groups=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro group $pkgsfile) # what can get trashed to save space - pkgs_junk=$(pl_parsePkgs junk $fcdistro $pldistro $pkgsfile) + pkgs_junk=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro junk $pkgsfile) # but not this - pkgs_precious=$(pl_parsePkgs precious $fcdistro $pldistro $pkgsfile) + pkgs_precious=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro precious $pkgsfile) # formerly related to mkfedora -k : packages to take from our own build # and thus need be excluded frem the stock repos # locate builddir by looking for pkgs.py builddir=$(dirname $(type -p pkgs.py)) SUBST_NODEYUMEXCLUDE=$(pl_nodeyumexclude $fcdistro $pldistro $builddir) - pkgs_yumexclude=$(pl_parsePkgs yumexclude $fcdistro $pldistro $pkgsfile | sed -e s,@NODEYUMEXCLUDE@,"$SUBST_NODEYUMEXCLUDE",) + pkgs_yumexclude=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro yumexclude $pkgsfile | sed -e s,@NODEYUMEXCLUDE@,"$SUBST_NODEYUMEXCLUDE",) # get mirrors if not specified with -l if [ -z "$mirrors" ] ; then mirrorsfile=$(pl_locateDistroFile ../build/ $pldistro "$pldistro.mirrors") - mirrors=$(pl_parsePkgs mirror $fcdistro $pldistro $mirrorsfile) + # do not sort mirrors, keep order from input + mirrors=$(pkgs.py -u -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro mirror $mirrorsfile) fi yumexclude_line="" @@ -374,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. @@ -544,6 +558,8 @@ function pl_fixdirs() { ########## .pkgs format # Usage: pl_parsePkgs keyword [-a arch] fcdistro pldistro pkgs-file[..s] # pkgs.py should be found in PATH, like this file build.common +# only usage should be for pl_getPackages and pl_getGroups, +# which in turn are usednow be in {node,slice}image/build.sh function pl_parsePkgs () { target_arch=$pl_DISTRO_ARCH keyword=$1;shift @@ -557,46 +573,9 @@ 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 "$@" ; } -############################## -### temporary - only for checking the new python version -# for a given keyword like 'package' : -# we support fcdistro-dependant format, for tokens (pkgname) without whitespace -# you can e.g. use -# package: pkg1 .. pkgn -# package+f8: pkg1 .. pkgn -# package-f8: pkg1 .. pkgn -# -# values can contain @arch@, @fcdistro@ or @pldistro@ that are replaced with the current values -# -# the reason for the -a option is for when we build the build vm itself; in this case -# pl_DISTRO_ARCH is the one we obtain from the root context, and that's wrong -# specify -sa arch AFTER keyword, so as to keep pl_getPackages and pl_getGroups simple -# -function pl_parsePkgs_old () { - - target_arch=$pl_DISTRO_ARCH - keyword=$1;shift - [ "$1" == "-a" ] && { shift; target_arch="$1"; shift; } - fcdistro=$1; shift - pldistro=$1; shift - # remaining arguments are paths to the pkgs files - - # grab regular descriptions - all=$(grep -v '^#' "$@" | grep --regexp="^${keyword}:" | sed -e "s,${keyword}:,,") - # grab additions - add=$(grep -v '^#' "$@" | grep --regexp="^${keyword}+${fcdistro}:" | sed -e "s,${keyword}+${fcdistro}:,,") - # grab exclusions - sub=$(grep -v '^#' "$@" | grep --regexp="^${keyword}-${fcdistro}:" | sed -e "s,${keyword}-${fcdistro}:,,") - - for rpm in $all $add; do - for exclude in $sub; do - [ "$rpm" = "$exclude" ] && continue 2 - done - echo "${rpm} " | sed -e "s,@arch@,${target_arch},g" -e "s,@fcdistro@,$fcdistro,g" -e "s,@pldistro@,$pldistro,g" - done - return 0 -} ############################## # locates a pldistro-dependant file @@ -612,7 +591,11 @@ function pl_locateDistroFile () { if [ ! -d $configdir ] ; then if [ -f "${configdir}.svnpath" -o -f "${configdir}.gitpath" ] ; then echo 1>&2 "Invoking make to extract remote config.${pldistro}" - make 1>&2 --silent --no-print-directory -C $builddir stage1=true config.${pldistro} + # we set PLDISTROTAGS here to /dev/null because when dealing with remote distros + # at a very early stage (like searching for devel.pkgs even before the build VM is created) + # then make screams because it cannot find a mandatory include file + # OTOH this mechanism here is not intended to depend on tags specifically + make 1>&2 --no-print-directory -C $builddir stage1=true config.${pldistro} PLDISTROTAGS=/dev/null fi fi # locate it @@ -767,3 +750,4 @@ function yumconf_exclude () { sed -i -e "/#baseurl=.*$/i\\ $yumexclude_line" $repo } +