X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=9deebc1ef8b2d3538530cd882481c0ac83c5c153;hb=0d30f02fa0c21b5f249d7b7c0e7374bed6ed4189;hp=ae938c30d60fe74b18e5bda61f98ea5dd105475a;hpb=a14676427a1e9c5c3c444e3f7689f928c8a85ba8;p=build.git diff --git a/build.common b/build.common index ae938c30..9deebc1e 100644 --- a/build.common +++ b/build.common @@ -9,6 +9,10 @@ # $Id$ # +### xxx thierry : looks like we should bump this to fedora 8 +### however, rather than the actual default, +### this looks more like the bottom of what we're able to build +### so I leave it with fc4 function pl_getDefaultDistro() { # FC4 is currently the default release echo "Fedora" @@ -32,6 +36,9 @@ function pl_getDistro() { return 0 } +### xxx thierry : when running in a centOS box, this issues a warning message +### because 5.2 is not an integer and bash cannot compare that +### seems harmless though function pl_getRelease() { defaultRelease=$(pl_getDefaultRelease) if [ -f "/etc/redhat-release" ] ; then @@ -57,12 +64,12 @@ function pl_getReleaseName () { releasename=f$release fi ;; [Cc]entOS*) - if [ "$release" = "4.5" ] ; then - # centos 4.5 is just centos4 + enhancements - releasename=centos4 - else - releasename=centos$release - fi ;; + old_IFS="$IFS" + IFS="." + set -- $release + IFS="$old_IFS" + releasename=centos$1 + ;; *) releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common" echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" @@ -79,9 +86,6 @@ 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) -# let mkfedora select one of its mirrors -pl_DISTRO_URL="" - # the release number (plain number) pl_DISTRO_RELEASE=$(pl_getRelease) @@ -128,7 +132,7 @@ function pl_process_fedora_options () { function pl_root_rpm_macros () { cat <.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 " legacy (use -f instead)" - echo " -g group1 -g group2 ..." - echo " Yumgroups to install (default: none)" - echo " -p package1 -p package2 ..." - echo " Additional packages to install (default: none)" - echo " -x package1 -x package2 ..." - echo " Packages to exclude (default: none)" exit 1 } @@ -221,119 +203,66 @@ function pl_root_mkfedora () { # Release and architecture to install : defaults to current vserver's settings or previously parsed fedora_options releasever=$pl_DISTRO_RELEASE basearch=$pl_DISTRO_ARCH - [ -n "$pl_DISTRO_URL" ] && mirrors=($pl_DISTRO_URL) - -# Yum groups to install - groups=() - -# Packages to install - packages=() - -# Packages to exclude - exclude=() - -# Exclude kernel* (and related) packages from all repositories except bootstrap - exclude_kernel= # Get options - while getopts "l:r:a:g:p:x:f:kvh" opt ; do +### mirrors="" +### while getopts "l:r:a:vh" opt ; do + while getopts "vh" opt ; do case $opt in - l) - if echo $OPTARG | grep -q -i '^\(file\|http[s]*\)://' ; then - mirrors=($OPTARG) - else - # xxx rather use this as a .mirrors file, searched in config.pldistro/ - # that would use the pkgs syntax with mirror: - #mirrors=($(pl_parsePkgs mirror $(pl_locateDistroFile ../build/ $OPTARG.mirrors))) - mirrors=(file://$OPTARG) - fi - ;; - r) - releasever=$OPTARG - ;; - a) - basearch=$OPTARG - ;; - g) - groups[${#groups[*]}]="$OPTARG" - ;; - p) - packages[${#packages[*]}]="$OPTARG" - ;; - x) - exclude[${#exclude[*]}]="$OPTARG" - ;; - f) - pkgsfile=$OPTARG - ;; - k) - exclude_kernel="exclude=kernel* ulogd iptables" - ;; - v) - verbose=1 - set -x - ;; - h|*) - mkfedora_usage - ;; +### l) mirrors="$mirrors $OPTARG" ;; +### r) releasever=$OPTARG ;; +### a) basearch=$OPTARG ;; + v) verbose=1; set -x ;; + h|*) mkfedora_usage ;; esac done shift $(($OPTIND - 1)) - [[ -n "$@" ]] || mkfedora_usage + [[ "$#" -lt 3 ]] && mkfedora_usage vroot=$1 ; shift + pldistro=$1 ; shift + pkgsfile="$@" vroot=$(cd $vroot && pwd -P) - [[ -z "$@" ]] || mkfedora_usage [ -d $vroot ] || mkfedora_usage - function mkfedora_fetch () - { - curl --fail --silent --max-time 60 "$1" - } - # set list of attempted locations according to releasever - if [ $releasever -ge 7 ] ; then - attempts=" -linux/releases/$releasever/Everything/$basearch/os -$releasever/Everything/$basearch/os -core/$releasever/Everything/$basearch/os -linux/core/$releasever/$basearch/os -" - else - attempts=" - linux/core/$releasever/$basearch/os - core/$releasever/$basearch/os - $releasever/$basearch/os - " + # 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) + # packages to exclude - obsolete, was maybe useful when installing a group + pkgs_excludes=$(pl_parsePkgs exclude $fcdistro $pldistro $pkgsfile) + pkgs_junk=$(pl_parsePkgs junk $fcdistro $pldistro $pkgsfile) + pkgs_precious=$(pl_parsePkgs precious $fcdistro $pldistro $pkgsfile) + # formerly related to mkfedora -k + pkgs_kexcludes=$(pl_parsePkgs kexclude $fcdistro $pldistro $pkgsfile) + # 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) + fi + + exclude_line="" + # add them manually as the output of pl_parsePkgs is line-separated + if [ -n "$pkgs_kexcludes" ] ; then + exclude_line="exclude=" + for kexclude in $pkgs_kexcludes ; do + exclude_line="$exclude_line $kexclude" + done fi echo "$0: candidate mirrors" - for mirror in "${mirrors[@]}" ; do + for mirror in $mirrors ; do echo "* candidate mirror $mirror" done - baseurl="" - for mirror in "${mirrors[@]}" ; do - for attempt in $attempts; do - attempturl=$mirror/$attempt - if mkfedora_fetch $attempturl/repodata/repomd.xml >/dev/null ; then - baseurl=$attempturl - break 2 - fi - done - done - if [ -z "$baseurl" ] ; then - echo "Error: $releasever/$basearch/os/repodata/repomd.xml" - echo " could not be found in any of the following locations:" - echo - for mirror in ${mirrors[@]} ; do - for attempt in $attempts ; do - echo $mirror/$attempt - done - done - echo - mkfedora_usage + # the repo part of the final yum.conf + yum_conf_repos=$vroot/xxxmkfedora-repos.confxxx + if ! yumconf_mirrors $yum_conf_repos ../build/ $fcdistro "$exclude_line" $mirrors ; then + echo xxx -- error ; return 1 fi + + public_gpg_key=$(yumconf_gpgkey $yum_conf_repos) # Do not tolerate errors set -e @@ -388,17 +317,14 @@ EOF # Initialize RPM database in reference image mkdir -p $vroot/var/lib/rpm rpm --root $vroot --initdb - rpm --root $vroot --import $baseurl/RPM-GPG-KEY-fedora + rpm --root $vroot --import $public_gpg_key # Initialize yum in reference image mkdir -p $vroot/var/cache/yum $vroot/var/log - if [ $releasever -lt 7 ] ; then - corename="Core " - else - corename="" - fi - cat >$vroot/etc/yum.conf < $yum_conf <>$vroot/etc/yum.conf <> $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. -### make takes care of that if [ -n "$RPM_BUILD_DIR" ] ; then RPM_RPMS_DIR=$(cd $(dirname $RPM_BUILD_DIR)/RPMS && pwd -P) -### # yum-2.0.x -### if [ -x /usr/bin/yum-arch ] ; then -### yum-arch -q $RPM_RPMS_DIR -### fi -### # yum-2.4.x -### if [ -x /usr/bin/createrepo ] ; then -### if [ -f $RPM_RPMS_DIR/yumgroups.xml ] ; then -### groupfile="-g yumgroups.xml" -### fi -### createrepo --quiet $groupfile $RPM_RPMS_DIR -### fi # 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 >>$vroot/etc/yum.conf <> $yum_conf < /dev/null && yum_options="$yum_options --verbose" + yum_options="$yum_options -y" + yum_options="$yum_options -c $yum_conf" + yum_options="$yum_options --installroot=$vroot" - excludes= - for package in "${exclude[@]}" ; do - excludes="$excludes --exclude=$package" + exclude_arg="" + for exclude in $pkgs_excludes; do + exclude_arg="$exclude_arg --exclude $exclude" done # glibc must be specified explicitly for the correct arch to be # chosen. echo "* Installing glibc" - yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes install glibc + yum $yum_options $exclude_arg install glibc # Go, baby, go - if [ ${#packages[*]} -gt 0 ] ; then - echo "* Installing optional packages" "${packages[@]}" - yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \ - install "${packages[@]}" - if ! rpm --root $vroot -q "${packages[@]}" >/dev/null ; then + if [ -n "$pkgs_packages" ] ; then + echo "* Installing optional packages" $pkgs_packages + yum $yum_options $exclude_arg install $pkgs_packages + if ! rpm --root $vroot -q $pkgs_packages >/dev/null ; then echo "* Warning: Missing packages" - rpm --root $vroot -q "${packages[@]}" | grep "not installed" + rpm --root $vroot -q $pkgs_packages | grep "not installed" fi fi - if [ ${#groups[*]} -gt 0 ] ; then + if [ -n "$pkgs_groups" ] ; then ## call yum sequentially to get finer-grained info on dependencies - for grp in "${groups[@]}" ; do + for grp in $pkgs_groups ; do echo "* Installing optional group $grp" - yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \ - groupinstall "$grp" + yum $yum_options $exclude_arg groupinstall "$grp" done fi # formerly in bootcd/prep.sh : to optimize footprint - echo "* Removing unnecessary junk" - - pushd $vroot - - # Save precious files - [ -n "$precious" ] && tar --ignore-failed-read -cpf precious.tar $precious - - # Remove unnecessary junk - [ -n "$junk" ] && rm -rf $junk - - # Restore precious files - [ -n "$precious" ] && tar -xpf precious.tar && rm -f precious.tar - - popd - -### # FC2 dev %preinstall checks /proc/mounts to make sure that /dev is -### # not currently mounted as devfs. If it thinks it is, it will refuse -### # to install the package. On a modern system running udev that mounts -### # /dev as tmpfs, this check fails. Since we are installing into a -### # chroot, whether /dev is mounted on the host system or not doesn't -### # matter. If dev was explicitly mentioned in the packages list, force -### # its installation. -### if [ "$releasever" = "2" ] ; then -### for package in "${packages[@]}" ; do -### if [ "$package" = "dev" ] && ! rpm --root $vroot -q dev >/dev/null 2>&1 ; then -### rpm --root $vroot -Uvh --noscripts $baseurl/Fedora/RPMS/dev-3.3.13-1.i386.rpm -### break -### fi -### done -### fi + if [ -n "$pkgs_junk" ] ; then + echo "* Removing unnecessary junk" + pushd $vroot + # Save precious files + [ -n "$pkgs_precious" ] && tar --ignore-failed-read -cpf precious.tar $pkgs_precious + # Remove unnecessary junk + [ -n "$pkgs_junk" ] && rm -rf $pkgs_junk + # Restore precious files + [ -n "$pkgs_precious" ] && tar -xpf precious.tar && rm -f precious.tar + popd + fi # Clean yum cache echo "* Cleaning up" - yum -c $vroot/etc/yum.conf --installroot=$vroot -y clean all + yum $yum_options clean all # Clean RPM state rm -f $vroot/var/lib/rpm/__db* @@ -561,6 +425,9 @@ fi ln -s /usr/share/zoneinfo/UTC $vroot/etc/localtime fi + echo "Dumping current list of rpms in /etc/mkfedora-rpms.txt" + chroot $vroot rpm -aq | sort > $vroot/etc/mkfedora-rpms.txt + # remove trap handler, as we are about to call it directly. trap - ERR INT @@ -570,12 +437,8 @@ fi return 0 } -function pl_root_setup_chroot() { +function pl_root_tune_image () { root=$1; shift - options="$@" - - pl_root_makedevs $root - pl_root_mkfedora $options $root # Disable all services in reference image chroot $root sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off" @@ -588,7 +451,7 @@ function pl_root_setup_chroot() { # 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 $vroot/etc/AUTO_UPDATE_NET_FILES + touch $root/etc/AUTO_UPDATE_NET_FILES } # Move specified directories out of a src tree into a dst tree, and @@ -607,7 +470,7 @@ function pl_move_dirs() { fi rm -rf ${root}/${datadir} mkdir -p $(dirname ${root}/${datadir}) - ln -nsf /${store}/${datadir} ${root}/${datadir} + ln -nsf ${store}/${datadir} ${root}/${datadir} done } @@ -634,7 +497,7 @@ function pl_make_image() { (cd $root && tar cpf - .) | (cd $tmp && tar xpf -) # Unmount it - umount -l $tmp + umount $tmp rmdir $tmp trap - ERR INT } @@ -658,37 +521,48 @@ function pl_fixdirs() { ########## .pkgs format # comments start with a # - this is needed only if you use a keyword in a comment + +function pl_getPkgsAttribute () { + keyword=$1; shift + file=$1; shift + # remove any initial white spaces from the result + grep -v '^#' $file | grep --regexp="^${keyword}:" | sed -e "s,${keyword}:,," -e "s,^[[:space:]][[:space:]]*,," +} + # 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 +# function pl_parsePkgs () { keyword=$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}:,,") + 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}:,,") + sub=$(grep -v '^#' "$@" | grep --regexp="^${keyword}-${fcdistro}:" | sed -e "s,${keyword}-${fcdistro}:,,") for i in $all $add; do for exclude in $sub; do [ "$i" = "$exclude" ] && continue 2 done - echo "$i " + echo "$i " | sed -e "s,@arch@,$pl_DISTRO_ARCH,g" -e "s,@fcdistro@,$fcdistro,g" -e "s,@pldistro@,$pldistro,g" done return 0 } -function pl_getPackages() { fcdistro=$1; shift ; pl_parsePkgs package $fcdistro "$@" ; } -function pl_getGroups() { fcdistro=$1; shift ; pl_parsePkgs group $fcdistro "$@" ; } +function pl_getPackages() { fcdistro=$1; shift ; pldistro=$1; shift ; pl_parsePkgs package $fcdistro $pldistro "$@" ; } +function pl_getGroups() { fcdistro=$1; shift ; pldistro=$1; shift ; pl_parsePkgs group $fcdistro $pldistro "$@" ; } # locates a pldistro-dependant file # tries first in build//, then in build/planetlab/ @@ -718,49 +592,127 @@ function pl_locateDistroFile () { fi } -# experimental function yumgroups_from_pkgs () { - groupname=$1; shift - groupdesc=$1; shift - pkgsfile=$1; shift - fcdistro=$pl_DISTRO_NAME - [[ -n "$@" ]] && fcdistro=$1; shift - if [[ -n "$@" ]] ; then - echo "yumgroups_from_pkgs : wrong signature" - return 1 - fi - - packages=$(pl_getPackages $fcdistro $pkgsfile) + builddir=$1; shift + pldistro=$1; shift + fcdistro=$1; shift + pkgsnames=$@ + + sedargs="-e s,@FCDISTRO@,$fcdistro,g" cat <<__header +__header + + for pkgsname in $pkgsnames; do + pkgsfile=$(pl_locateDistroFile $builddir $pldistro $pkgsname) + packages=$(pl_getPackages $fcdistro $pldistro $pkgsfile) + + groupname=$(pl_getPkgsAttribute groupname $pkgsfile | sed $sedargs) + groupdesc=$(pl_getPkgsAttribute 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 - true $groupdesc - false + true -__header - - for package in $packages; do - echo "$package" - done - -cat <<__footer +__group_header + for package in $packages; do + echo "$package" + done + cat << __group_footer +__group_footer + done +cat <<__footer __footer } -function toplevel_yumgroups () { - pldistro=$1; shift - pkgsname=$1; shift - builddir=$(dirname $0) - pkgsfile=$(pl_locateDistroFile $builddir $pldistro $pkgsname) - yumgroups_from_pkgs 'PlanetLab' 'PlanetLab Node Root' $pkgsfile + +function build_fetch () { + 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/ +# returns 0 and writes on success +# returns 1 on failure, in which case is deleted +function yumconf_mirrors () { + dest_yumconf=$1; shift + builddir=$1; shift + fcdistro=$1; shift + exclude_line="$1" ; shift + 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 + fi + + for mirror in $mirrors; do + if yumconf_mirror $dest_yumconf $template "$exclude_line" $mirror; then + return 0 + fi + done + rm -f $dest_yumconf + return 1 +} + +# computes a yum.conf from the template, and checks that all baseurl defined in there are valid repos +# returns 0 on success and 1 on failure +function yumconf_mirror () { + dest_yumconf=$1; shift + template=$1; shift + exclude_line="$1" ; shift + mirror=$1; shift + + sed -e "s,@MIRRORURL@,$mirror,g" \ + -e "/baseurl=/i\\ +$exclude_line" $template > $dest_yumconf + + # capture all lines defining baseurl + baseurl_defs=$(grep '^baseurl=' $dest_yumconf) + if [ -z "$baseurl_defs" ] ; then + 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 + done + echo "* Selected mirror $mirror" + return 0 } +# from a yum.conf as generated above, computes the (first) gpgkey url +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 + return 0 +}