X-Git-Url: http://git.onelab.eu/?p=build.git;a=blobdiff_plain;f=build.common;h=2007f1126bc6e2dcd41909867160d7695ad9b14c;hp=071a96580edb1bfce4721cad8fed7d87c878614a;hb=HEAD;hpb=e5b6b489890388a37fb0cbedb349dd6b65b46a6d diff --git a/build.common b/build.common index 071a9658..9d59dcb9 100644 --- a/build.common +++ b/build.common @@ -7,8 +7,8 @@ # Copyright (C) 2007 The Trustees of Princeton University # Thierry Parmentelat 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 @@ -16,19 +16,18 @@ export PATH=.:$PATH # returns 'Fedora' or 'CentOS' for now function pl_getDistro() { if [ -f "/etc/redhat-release" ] ; then - distro=$(awk ' { print $1 } ' /etc/redhat-release) - case $distro in Scientific*) distro="SL" ; esac + distro=$(awk ' { print $1 } ' /etc/redhat-release) + case $distro in Scientific*) distro="SL" ; esac elif [ -f /etc/lsb-release ] ; then - . /etc/lsb-release - echo $DISTRIB_CODENAME + . /etc/lsb-release + distro=$DISTRIB_CODENAME elif [ -f /etc/debian_version ] ; then - case $(cat /etc/debian_version) in - 6.*) distro=squeeze ;; - 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 + 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" @@ -38,10 +37,10 @@ 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=="Scientific") print $4 } ' /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 + echo "build.common.pl_getRelease-unknown" + exit 1 fi # keep only the major number echo "$release" | cut -d. -f1 @@ -53,27 +52,27 @@ function pl_getReleaseName () { distro=$1; shift release=$1; shift case $distro in - [Ff]edora*) - releasename=f$release - ;; - [Cc]entOS*) - old_IFS="$IFS" - IFS="." - set -- $release - IFS="$old_IFS" - releasename=centos$1 - ;; - [Ss]L*) - releasename=sl$release - ;; - squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty) - releasename=$distro - ;; - *) - releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common" - echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" - return 1 - ;; + [Ff]edora*) + releasename=f$release + ;; + [Cc]entOS*) + old_IFS="$IFS" + IFS="." + set -- $release + IFS="$old_IFS" + releasename=centos$1 + ;; + [Ss]L*) + releasename=sl$release + ;; + wheezy|jessie|trusty|xenial|bionic|focal|jammy) + releasename=$distro + ;; + *) + releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common" + echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" + return 1 + ;; esac echo "$releasename" return 0 @@ -94,7 +93,7 @@ function pl_yumexclude () { # 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 ; } + { echo pl_yumexclude failed with fcdistro=$fcdistro and pldistro=$pldistro; return 1 ; } } # <> fcdistro pldistro builddir @@ -109,7 +108,7 @@ pl_DISTRO=$(pl_getDistro) # select basearch of the host devel environment - protected for macos for local tests # try arch for testing stuff on a mac -pl_DISTRO_ARCH=$(uname -i 2>/dev/null || arch 2> /dev/null || echo unknownarch) +pl_DISTRO_ARCH=$(arch 2> /dev/null || echo unknownarch) # the release number (plain number) pl_DISTRO_RELEASE=$(pl_getRelease) @@ -118,7 +117,7 @@ pl_DISTRO_RELEASE=$(pl_getRelease) pl_DISTRO_NAME=$(pl_getReleaseName $pl_DISTRO $pl_DISTRO_RELEASE) # get path to appropriate yumgroups.xml file -# Thierry: quick & dirty improvement +# Thierry: quick & dirty improvement # this file is updated by the toplevel build, from the .pkgs files pl_DISTRO_YUMGROUPS="../../../RPMS/yumgroups.xml" @@ -126,29 +125,29 @@ function pl_process_fedora_options () { # Get options shiftcount=0 while getopts "l:r:a:h" opt ; do - case $opt in - l) - pl_DISTRO_URL=$OPTARG - let shiftcount=$shiftcount+2 - ;; - r) - pl_DISTRO_RELEASE=$OPTARG - let shiftcount=$shiftcount+2 - ;; - a) - pl_DISTRO_ARCH=$OPTARG - let shiftcount=$shiftcount+2 - ;; - h|*) - echo "Usage: $0 [OPTION]..." - echo " -l url distro mirror location (default: $pl_DISTRO_URL)" - echo " -r release distro release number (default: $pl_DISTRO_RELEASE)" - echo " -a arch distro architecture (default: $pl_DISTRO_ARCH)" - echo "where distro can be either fedora, centos, or redhat" - echo " -h This message" - exit 1 - ;; - esac + case $opt in + l) + pl_DISTRO_URL=$OPTARG + let shiftcount=$shiftcount+2 + ;; + r) + pl_DISTRO_RELEASE=$OPTARG + let shiftcount=$shiftcount+2 + ;; + a) + pl_DISTRO_ARCH=$OPTARG + let shiftcount=$shiftcount+2 + ;; + h|*) + echo "Usage: $0 [OPTION]..." + echo " -l url distro mirror location (default: $pl_DISTRO_URL)" + echo " -r release distro release number (default: $pl_DISTRO_RELEASE)" + echo " -a arch distro architecture (default: $pl_DISTRO_ARCH)" + echo "where distro can be either fedora, centos, or redhat" + echo " -h This message" + exit 1 + ;; + esac done return $shiftcount } @@ -167,7 +166,7 @@ function pl_root_makedevs() { vroot=$1 # Clean ${vroot}/dev, but only when ${vroot}!="" [ -n $vroot ] && rm -rf $vroot/dev - + mkdir -p $vroot/dev mknod -m 666 $vroot/dev/null c 1 3 mknod -m 666 $vroot/dev/zero c 1 5 @@ -193,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 vm. + # 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 + 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 " -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 " -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)" exit 1 } @@ -216,8 +215,8 @@ function pl_root_mkfedora () { echo "* Entering pl_root_mkfedora" "$@" if [ $UID -ne 0 ] ; then - echo "Error: You must run this script as root." - exit 1 + echo "Error: You must run this script as root." + exit 1 fi # Verbosity @@ -229,30 +228,30 @@ function pl_root_mkfedora () { # Get options while getopts "vh" opt ; do - case $opt in - v) verbose=1; set -x ;; - h|*) mkfedora_usage ;; - esac + case $opt in + v) verbose=1; set -x ;; + 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=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro package $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=$(pkgs.py -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro junk $pkgsfile) # but not this 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 + # 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)) @@ -260,9 +259,9 @@ function pl_root_mkfedora () { 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") - # do not sort mirrors, keep order from input - mirrors=$(pkgs.py -u -a $pl_DISTRO_ARCH -f $fcdistro -d $pldistro mirror $mirrorsfile) + mirrorsfile=$(pl_locateDistroFile ../build/ $pldistro "$pldistro.mirrors") + # 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="" @@ -270,15 +269,15 @@ function pl_root_mkfedora () { echo "$0: candidate mirrors" for mirror in $mirrors ; do - echo "* candidate mirror $mirror" + echo "* candidate mirror $mirror" done # the repo part of the final yum.conf yum_conf_repos=$vroot/xxxmkfedora-repos.confxxx if ! yumconf_mirrors $yum_conf_repos ../build/ $fcdistro "$yumexclude_line" $mirrors ; then - echo xxx -- error ; return 1 + echo xxx -- error ; return 1 fi - + # Do not tolerate errors set -e @@ -289,7 +288,7 @@ function pl_root_mkfedora () { # you have to use at least one language beside 'C' # Prevent all locales from being installed in reference image mkdir -p $vroot/etc/rpm - pl_root_rpm_macros > $vroot/etc/rpm/macros + pl_root_rpm_macros > $vroot/etc/rpm/macros # Trick rpm and yum, who read the real root /etc/rpm/macros file # rather than the one installed in the reference image, despite what @@ -300,9 +299,9 @@ function pl_root_mkfedora () { pl_root_rpm_macros > $vroot/tmp/.rpmmacros function mkfedora_cleanup () { - umount -l $vroot/proc - umount -l $vroot/dev/shm - umount -l $vroot/dev/pts + umount -l $vroot/proc + umount -l $vroot/dev/shm + umount -l $vroot/dev/pts } # Clean up before exiting if anything goes wrong @@ -313,7 +312,7 @@ function pl_root_mkfedora () { mount -t tmpfs none $vroot/dev/shm mkdir -p $vroot/proc mount -t proc none $vroot/proc - + # Create a /var/lib dirs for yum & rpm mkdir -p $vroot/var/lib/yum mkdir -p $vroot/var/lib/rpm @@ -323,7 +322,7 @@ function pl_root_mkfedora () { mkdir -p $vroot/etc cat >$vroot/etc/fstab <> $yum_conf # If we are being built as part of an automated RPM build, solve the # bootstrap problem by including any just built packages in the yum # configuration. This cooperates with the PlanetLab build system. if [ -n "$RPM_BUILD_DIR" ] ; then - RPM_RPMS_DIR=$(cd $(dirname $RPM_BUILD_DIR)/RPMS && pwd -P) + RPM_RPMS_DIR=$(cd $(dirname $RPM_BUILD_DIR)/RPMS && pwd -P) # If run under sudo, allow user to delete the headers/ and # repodata/ directories. - if [ -n "$SUDO_USER" ] ; then - chown -R $SUDO_USER $RPM_RPMS_DIR - fi - cat >> $yum_conf <> $yum_conf </dev/null ; then - echo "* Warning: Missing packages" - rpm --root $vroot -q $pkgs_packages | grep "not installed" - fi + 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" + rpm --root $vroot -q $pkgs_packages | grep "not installed" + fi fi if [ -n "$pkgs_groups" ] ; then ## call yum sequentially to get finer-grained info on dependencies - for group_plus in $pkgs_groups ; do - group=$(echo $group_plus | sed -e "s,+++, ,g") - echo "* Installing optional group $group" + for group_plus in $pkgs_groups ; do + group=$(echo $group_plus | sed -e "s,+++, ,g") + echo "* Installing optional group $group" # ignore yum's return code that is basically undefined - yum $yum_options groupinstall "$group" || : - done + yum $yum_options groupinstall "$group" || : + done fi # formerly in bootcd/prep.sh : to optimize footprint if [ -n "$pkgs_junk" ] ; then - echo "* Removing unnecessary junk" - pushd $vroot + echo "* Removing unnecessary junk" + pushd $vroot # Save precious files - [ -n "$pkgs_precious" ] && tar --ignore-failed-read -cpf precious.tar $pkgs_precious + [ -n "$pkgs_precious" ] && tar --ignore-failed-read -cpf precious.tar $pkgs_precious # Remove unnecessary junk - [ -n "$pkgs_junk" ] && rm -rf $pkgs_junk + [ -n "$pkgs_junk" ] && rm -rf $pkgs_junk # Restore precious files - [ -n "$pkgs_precious" ] && tar -xpf precious.tar && rm -f precious.tar - popd + [ -n "$pkgs_precious" ] && tar -xpf precious.tar && rm -f precious.tar + popd fi # Clean yum cache echo "* Cleaning up" - # NOTE: this hack is for Fedora >= 12. - # if kernel-debug is installed, clean it up - # we link to our version of kernel/initrd and clean up - # kernel-debug manually - if rpm --root $vroot --quiet -q kernel-debug ; then - echo "* Cleaning up kernel-debug - (workaround for f12)" - pushd $vroot/boot/ - rm -rf kernel-boot kernel-bootsmp initrd-boot initrd-bootsmp - ln -s vmlinuz-*${pldistro}* kernel-boot - ln -s vmlinuz-*${pldistro}* kernel-bootsmp - ln -s initrd-*${pldistro}* initrd-boot - ln -s initrd-*${pldistro}* initrd-bootsmp - rpm --root $vroot --nodeps -e kernel-debug || : - popd - fi +# # NOTE: this hack is for Fedora >= 12. +# # if kernel-debug is installed, clean it up +# # kernel-debug manually +# # we link to our version of kernel/initrd and clean up +# if rpm --root $vroot --quiet -q kernel-debug ; then +# echo "* Cleaning up kernel-debug - (workaround for f12)" +# pushd $vroot/boot/ +# rm -rf kernel-boot kernel-bootsmp initrd-boot initrd-bootsmp +# ln -s vmlinuz-*${pldistro}* kernel-boot +# ln -s vmlinuz-*${pldistro}* kernel-bootsmp +# ln -s initrd-*${pldistro}* initrd-boot +# ln -s initrd-*${pldistro}* initrd-bootsmp +# rpm --root $vroot --nodeps -e kernel-debug || : +# popd +# fi # ignore yum's return code that is basically undefined yum $yum_options clean all || : @@ -457,8 +457,8 @@ fi # Set time zone to UTC if [ -f $vroot/usr/share/zoneinfo/UTC -a -f $vroot/etc/localtime ] ; then - rm -f $vroot/etc/localtime - ln -s /usr/share/zoneinfo/UTC $vroot/etc/localtime + rm -f $vroot/etc/localtime + ln -s /usr/share/zoneinfo/UTC $vroot/etc/localtime fi echo "Dumping current list of rpms in /etc/mkfedora-rpms.txt" @@ -476,6 +476,15 @@ fi function pl_root_tune_image () { root=$1; shift + # This tells the Boot Manager that it is okay to update + # /etc/resolv.conf and /etc/hosts whenever the network configuration + # changes. Users are free to delete this file. + touch $root/etc/AUTO_UPDATE_NET_FILES + + # all this sounds terribly old and out of scope + # turning off for fedora31 where it just fails + return 0 + # Disable all services in reference image chroot $root sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off" @@ -484,10 +493,6 @@ function pl_root_tune_image () { rm -f $root/sbin/minilogd ln -nsf /bin/true $root/sbin/minilogd - # This tells the Boot Manager that it is okay to update - # /etc/resolv.conf and /etc/hosts whenever the network configuration - # changes. Users are free to delete this file. - touch $root/etc/AUTO_UPDATE_NET_FILES } # Move specified directories out of a src tree into a dst tree, and @@ -500,13 +505,13 @@ function pl_move_dirs() { mkdir -p $root/data for datadir in "$@" ; do - mkdir -p ${data}${datadir} - if [ -d ${root}/${datadir} -a ! -h ${root}/${datadir} ] ; then - (cd ${root} && find ./${datadir} | cpio -p -d -u ../${data}/) - fi - rm -rf ${root}/${datadir} - mkdir -p $(dirname ${root}/${datadir}) - ln -nsf ${store}/${datadir} ${root}/${datadir} + mkdir -p ${data}${datadir} + if [ -d ${root}/${datadir} -a ! -h ${root}/${datadir} ] ; then + (cd ${root} && find ./${datadir} | cpio -p -d -u ../${data}/) + fi + rm -rf ${root}/${datadir} + mkdir -p $(dirname ${root}/${datadir}) + ln -nsf ${store}/${datadir} ${root}/${datadir} done } @@ -548,10 +553,10 @@ function pl_fixdirs() { root=$1 datadirs=$2 for datadir in datadirs ; do - if [ -h ${root}/${datadir} ] ; then - rm -f ${root}/${datadir} - mkdir -p ${root}/${datadir} - fi + if [ -h ${root}/${datadir} ] ; then + rm -f ${root}/${datadir} + mkdir -p ${root}/${datadir} + fi done } @@ -568,7 +573,7 @@ function pl_parsePkgs () { 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 "$@" + 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 "$@" ; } @@ -589,32 +594,32 @@ function pl_locateDistroFile () { # if config dir is missing but a .svnpath or a .gitpath exists, use it to extract the config dir configdir="$builddir/config.${pldistro}" if [ ! -d $configdir ] ; then - if [ -f "${configdir}.svnpath" -o -f "${configdir}.gitpath" ] ; then - echo 1>&2 "Invoking make to extract remote 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 + if [ -f "${configdir}.svnpath" -o -f "${configdir}.gitpath" ] ; then + echo 1>&2 "Invoking make to extract remote 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 paths="$builddir/config.$pldistro/$pkgsfile $builddir/config.planetlab/$pkgsfile" for path in $paths; do - if [ -f $path ] ; then - pkgspath=$path - break - fi + if [ -f $path ] ; then + pkgspath=$path + break + fi done if [ -z "$pkgspath" ] ; then - echo 1>&2 "pl_locateDistroFile - in $(pwd) : cannot locate $pkgsfile in $builddir" - echo 1>&2 "candidates were $paths" - echo "not-found-by-pl_locateDistroFile" - return 1 + echo 1>&2 "pl_locateDistroFile - in $(pwd) : cannot locate $pkgsfile in $builddir" + echo 1>&2 "candidates were $paths" + echo "not-found-by-pl_locateDistroFile" + return 1 else - echo 1>&2 "pl_locateDistroFile: using $pkgspath" - echo $pkgspath - return 0 + echo 1>&2 "pl_locateDistroFile: using $pkgspath" + echo $pkgspath + return 0 fi } @@ -633,18 +638,18 @@ function yumgroups_from_pkgs () { __header for pkgsname in $pkgsnames; do - pkgsfile=$(pl_locateDistroFile $builddir $pldistro $pkgsname) - packages=$(pl_getPackages $fcdistro $pldistro $pkgsfile) - - groupname=$(pkgs.py groupname $pkgsfile | sed $sedargs) - groupdesc=$(pkgs.py groupdesc $pkgsfile | sed $sedargs) - - if [ -z "$groupname" -o -z "$groupdesc" ] ; then - echo "Cannot find groupname: and groupdesc: in $pkgsfile -- skipped" 1>&2 - continue - fi - - cat << __group_header + pkgsfile=$(pl_locateDistroFile $builddir $pldistro $pkgsname) + packages=$(pl_getPackages $fcdistro $pldistro $pkgsfile) + + groupname=$(pkgs.py groupname $pkgsfile | sed $sedargs) + groupdesc=$(pkgs.py groupdesc $pkgsfile | sed $sedargs) + + if [ -z "$groupname" -o -z "$groupdesc" ] ; then + echo "Cannot find groupname: and groupdesc: in $pkgsfile -- skipped" 1>&2 + continue + fi + + cat << __group_header $(echo $groupname|tr A-Z a-z) $groupname @@ -652,10 +657,10 @@ __header true __group_header - for package in $packages; do - echo "$package" - done - cat << __group_footer + for package in $packages; do + echo "$package" + done + cat << __group_footer __group_footer @@ -667,7 +672,7 @@ __footer function build_fetch () { - curl --fail --silent --max-time 60 --output /dev/null "$1" + curl --fail --silent --max-time 60 --output /dev/null "$1" } # tries to compute a valid yum.conf for that pldistro from the template in mirroring/ @@ -681,17 +686,17 @@ function yumconf_mirrors () { mirrors="$@" template=$builddir/mirroring/$fcdistro/yum.repos.d/building.repo.in - + if [ ! -f $template ] ; then - echo "yumconf_mirrors: cannot locate template $template" - rm -f $dest_yumconf - return 1 + echo "yumconf_mirrors: cannot locate template $template" + rm -f $dest_yumconf + return 1 fi for mirror in $mirrors; do - if yumconf_mirror $dest_yumconf $template "$yumexclude_line" $mirror; then - return 0 - fi + if yumconf_mirror $dest_yumconf $template "$yumexclude_line" $mirror; then + return 0 + fi done echo 'yumconf_mirrors in build.common : ran out of mirrors -- BAILING OUT' rm -f $dest_yumconf @@ -707,26 +712,26 @@ function yumconf_mirror () { mirror=$1; shift sed -e "s,@MIRRORURL@,$mirror,g" \ - -e "/baseurl=/i\\ + -e "/baseurl=/i\\ $yumexclude_line" $template > $dest_yumconf - + # capture all lines defining baseurl baseurl_defs=$(grep '^baseurl=' $dest_yumconf) if [ -z "$baseurl_defs" ] ; then - return 1 + return 1 fi for baseurl_def in $baseurl_defs; do - baseurl=$(echo $baseurl_def | sed \ - -e s,baseurl=,, \ - -e 's,$basearch,'"$pl_DISTRO_ARCH",g) - repomd=$baseurl/repodata/repomd.xml - - echo "* Trying to fetch $repomd" - if ! build_fetch $repomd ; then - echo "* Failed to fetch $repomd" - return 1 - fi + baseurl=$(echo $baseurl_def | sed \ + -e s,baseurl=,, \ + -e 's,$basearch,'"$pl_DISTRO_ARCH",g) + repomd=$baseurl/repodata/repomd.xml + + echo "* Trying to fetch $repomd" + if ! build_fetch $repomd ; then + echo "* Failed to fetch $repomd" + return 1 + fi done echo "* Selected mirror $mirror" return 0 @@ -746,7 +751,8 @@ function yumconf_gpgkey () { function yumconf_exclude () { repo=$1; shift yumexclude_line="$1" ; shift - + sed -i -e "/#baseurl=.*$/i\\ $yumexclude_line" $repo } +