X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=c0c73dea030359699866ab9d6a023e4de8a2806a;hb=d2f5b4c423f9b55f62eb744b8d367d37d7d635f3;hp=6bffc4c61f34863d170b2cd72ceefa5ceddca418;hpb=6719939f372ab2089ba5fda311eac9db9be50657;p=build.git diff --git a/build.common b/build.common index 6bffc4c6..c0c73dea 100644 --- a/build.common +++ b/build.common @@ -1,15 +1,14 @@ # -*-Shell-script-*- # -# $Id$ -# $URL$ -# # Common functions for build scripts used by various packages -# incorporated (e.g., build, myplc, myplc-devel, vserver-reference) +# incorporated (e.g., build, bootcd, nodeimage, sliceimage) # # Marc E. Fiuczynski # Copyright (C) 2007 The Trustees of Princeton University +# Thierry Parmentelat INRIA # -# supported distros f8, f10, f12, centos5 +# 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 @@ -18,11 +17,19 @@ export PATH=.:$PATH function pl_getDistro() { if [ -f "/etc/redhat-release" ] ; then distro=$(awk ' { print $1 } ' /etc/redhat-release) - case $distro in Red*) distro="Redhat" ; esac - else - echo "build.common.pl_getDistro-unknown" - exit 1 + 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 + 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 } @@ -30,7 +37,7 @@ function pl_getDistro() { # returns something like 8, 10, or 5.3 function pl_getRelease() { if [ -f "/etc/redhat-release" ] ; then - release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 ; if ($1=="Red") print $6 } ' /etc/redhat-release) + release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 ; if ($1=="Scientific") print $4 } ' /etc/redhat-release) else echo "build.common.pl_getRelease-unknown" exit 1 @@ -40,7 +47,7 @@ function pl_getRelease() { return 0 } -# returns stuff for vserver, i.e. something like 'f8' or 'centos5' +# returns distro shortname, something like 'f8' or 'centos5' function pl_getReleaseName () { distro=$1; shift release=$1; shift @@ -48,9 +55,6 @@ function pl_getReleaseName () { [Ff]edora*) releasename=f$release ;; - [Re]edhat*) - releasename=rhel6 - ;; [Cc]entOS*) old_IFS="$IFS" IFS="." @@ -58,6 +62,12 @@ function pl_getReleaseName () { IFS="$old_IFS" releasename=centos$1 ;; + [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" @@ -68,40 +78,44 @@ function pl_getReleaseName () { return 0 } -# on fedora 8 or above, we use libnl from the stock repos -# on centos5 we build it locally -function pl_getKexcludes () { - distroname=$1; shift - case $distroname in - ### there is an ugly hack going on around here - # with f12, the dependencies somehow require kernel 2.6.29 but our own kernel is 2.6.27 - # so the ugly workaround here is to let 'kernel-debug' get installed from the stock repos - # we then remove it manually after the image is done, look for kernel-debug below - # relyong on kernel-PAE for this trick won't work, as 64 bits distros don't have PAE of course - f*) - echo 'kernel kernel-PAE kernel-PAEdebug kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iptables-ipv6 iproute drupal' ;; - centos5) - echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iproute drupal inotify-tools* libnl' ;; - *) - echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh" ; exit 1 ;; - esac +# yum exclusions are now defined in yumexclude.pkgs +# so they can now depend both on the linux distro and the pl distro +function pl_yumexclude () { + keyword=$1; shift + fcdistro=$1; shift + pldistro=$1; shift + builddir=$1; shift + # search for file "yumexclude.pkgs" + yumexclude_file=$(pl_locateDistroFile $builddir $pldistro "yumexclude.pkgs") + # + # check if pkgs.py is in PATH + type -p pkgs.py >& /dev/null || export PATH=$builddir:$PATH + + # parse it + 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 ; } } +# <> fcdistro pldistro builddir +# node side : use the 'nodeyumexclude' keywork in yumexclude.pkgs +function pl_nodeyumexclude () { pl_yumexclude 'nodeyumexclude' "$@" ; } +# server side : use the 'plcyumexclude' keywork in yumexclude.pkgs +function pl_plcyumexclude () { pl_yumexclude 'plcyumexclude' "$@" ; } + + # figure out which redhat distro we are using (fedora, centos, redhat) pl_DISTRO=$(pl_getDistro) # select basearch of the host devel environment - protected for macos for local tests -pl_DISTRO_ARCH=$(uname -i 2>/dev/null|| echo unknownarch) +# try arch for testing stuff on a mac +pl_DISTRO_ARCH=$(uname -i 2>/dev/null || arch 2> /dev/null || echo unknownarch) # the release number (plain number) pl_DISTRO_RELEASE=$(pl_getRelease) -# the release name - for vserver build ... +# the release name - something like 'f8' or 'sl6' pl_DISTRO_NAME=$(pl_getReleaseName $pl_DISTRO $pl_DISTRO_RELEASE) -# the packages to exclude -pl_KEXCLUDES=$(pl_getKexcludes $pl_DISTRO_NAME) - # get path to appropriate yumgroups.xml file # Thierry: quick & dirty improvement # this file is updated by the toplevel build, from the .pkgs files @@ -170,8 +184,6 @@ function pl_root_makedevs() { # For pseudo ttys mkdir -p $vroot/dev/pts - # (Might have to remove the following for vserver-reference.) - # for tmpfs mount mkdir -p $vroot/dev/shm @@ -180,21 +192,21 @@ function pl_root_makedevs() { mknod -m 600 $vroot/dev/net/tun c 10 200 # For mkinitrd (in case a kernel is being installed) - # As well as for loop back mounting within a vserver. + # As well as for loop back mounting within a vm. for i in $(seq 0 255) ; do mknod -m 640 $vroot/dev/loop$i b 7 $i 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 vserver)" - 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 } @@ -210,7 +222,7 @@ function pl_root_mkfedora () { # Verbosity verbose=0 -# Release and architecture to install : defaults to current vserver's settings or previously parsed fedora_options +# Release and architecture to install : defaults to current vm settings or previously parsed fedora_options releasever=$pl_DISTRO_RELEASE basearch=$pl_DISTRO_ARCH @@ -218,38 +230,42 @@ 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 - pkgs_kexcludes=$(pl_parsePkgs kexclude $fcdistro $pldistro $pkgsfile | sed -e s,@KEXCLUDE@,"$pl_KEXCLUDES",) + # locate builddir by looking for pkgs.py + builddir=$(dirname $(type -p pkgs.py)) + SUBST_NODEYUMEXCLUDE=$(pl_nodeyumexclude $fcdistro $pldistro $builddir) + 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 - kexclude_line="" - [ -n "$pkgs_kexcludes" ] && kexclude_line="exclude=$pkgs_kexcludes" + yumexclude_line="" + [ -n "$pkgs_yumexclude" ] && yumexclude_line="exclude=$pkgs_yumexclude" echo "$0: candidate mirrors" for mirror in $mirrors ; do @@ -258,7 +274,7 @@ function pl_root_mkfedora () { # the repo part of the final yum.conf yum_conf_repos=$vroot/xxxmkfedora-repos.confxxx - if ! yumconf_mirrors $yum_conf_repos ../build/ $fcdistro "$kexclude_line" $mirrors ; then + if ! yumconf_mirrors $yum_conf_repos ../build/ $fcdistro "$yumexclude_line" $mirrors ; then echo xxx -- error ; return 1 fi @@ -330,6 +346,7 @@ cachedir=/var/cache/yum debuglevel=2 logfile=/var/log/yum.log pkgpolicy=newest +multilib_policy=best distroverpkg=redhat-release tolerant=1 exactarch=1 @@ -370,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. @@ -381,6 +399,7 @@ fi if [ -n "$pkgs_packages" ] ; then echo "* Installing optional packages" $pkgs_packages # ignore yum's return code that is basically undefined + echo "* Install options" $vroot $yum_options yum $yum_options install $pkgs_packages || : if ! rpm --root $vroot -q $pkgs_packages >/dev/null ; then echo "* Warning: Missing packages" @@ -539,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 @@ -546,51 +567,15 @@ function pl_parsePkgs () { fcdistro=$1; shift pldistro=$1; shift + echo 1>&2 "pl_parsePkgs: using -a $target_arch -f $fcdistro -d $pldistro $keyword $@" pkgs.py -a $target_arch -f $fcdistro -d $pldistro $keyword "$@" } # 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 vserver 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 @@ -606,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 @@ -688,7 +677,7 @@ function yumconf_mirrors () { dest_yumconf=$1; shift builddir=$1; shift fcdistro=$1; shift - kexclude_line="$1" ; shift + yumexclude_line="$1" ; shift mirrors="$@" template=$builddir/mirroring/$fcdistro/yum.repos.d/building.repo.in @@ -700,7 +689,7 @@ function yumconf_mirrors () { fi for mirror in $mirrors; do - if yumconf_mirror $dest_yumconf $template "$kexclude_line" $mirror; then + if yumconf_mirror $dest_yumconf $template "$yumexclude_line" $mirror; then return 0 fi done @@ -714,12 +703,12 @@ function yumconf_mirrors () { function yumconf_mirror () { dest_yumconf=$1; shift template=$1; shift - kexclude_line="$1" ; shift + yumexclude_line="$1" ; shift mirror=$1; shift sed -e "s,@MIRRORURL@,$mirror,g" \ -e "/baseurl=/i\\ -$kexclude_line" $template > $dest_yumconf +$yumexclude_line" $template > $dest_yumconf # capture all lines defining baseurl baseurl_defs=$(grep '^baseurl=' $dest_yumconf) @@ -743,23 +732,22 @@ $kexclude_line" $template > $dest_yumconf return 0 } -# from a yum.conf as generated above, computes the (first) gpgkey url +# from a yum.conf as generated above, computes the gpgkey urls function yumconf_gpgkey () { dest_yumconf=$1; shift - first_line=$(grep '^gpgkey=' $dest_yumconf | head -1) - values=$(echo $first_line | sed -e s,gpgkey=,,) - value=$(echo $values | awk '{print $1;}' | sed -e 's,$basearch,'"$pl_DISTRO_ARCH",g) - [ -n "$value" ] || return 1 - echo $value + values=$(grep -h '^gpgkey=' $dest_yumconf | sed -e s,gpgkey=,, | sed -e 's,$basearch,'"$pl_DISTRO_ARCH",g | sed -e 's, ,\n,g' | sort | uniq | xargs) + [ -n "$values" ] || return 1 + echo $values return 0 } # patches a yum conf to insert an exclude line in each declared repo function yumconf_exclude () { repo=$1; shift - kexclude_line="$1" ; shift + yumexclude_line="$1" ; shift sed -i -e "/#baseurl=.*$/i\\ -$kexclude_line" $repo +$yumexclude_line" $repo } +