X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=9deebc1ef8b2d3538530cd882481c0ac83c5c153;hb=4cd410e39454452cad6194f7219fa528686a6193;hp=463aaf6d9a40552d938d48b14f71487fea30ade6;hpb=c4e209060103076da66862f1315212c2471da26a;p=build.git diff --git a/build.common b/build.common index 463aaf6d..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,15 +64,15 @@ 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=$pl_DISTRO" + echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" return 1 ;; esac @@ -76,17 +83,14 @@ function pl_getReleaseName () { # figure out which redhat distro we are using (fedora, centos, redhat) pl_DISTRO=$(pl_getDistro) -# select basearch of the host devel environment -pl_DISTRO_ARCH=$(uname -i) - -# let mkfedora select one of its mirrors -pl_DISTRO_URL="" +# select basearch of the host devel environment - protected for macos for local tests +pl_DISTRO_ARCH=$(uname -i 2>/dev/null|| echo unknownarch) # the release number (plain number) pl_DISTRO_RELEASE=$(pl_getRelease) # the release name - for vserver build - like fc4, f8 or centos4 -pl_DISTRO_NAME=$(pl_getReleaseName) +pl_DISTRO_NAME=$(pl_getReleaseName $pl_DISTRO $pl_DISTRO_RELEASE) # get path to appropriate yumgroups.xml file # Thierry: quick & dirty improvement @@ -124,7 +128,17 @@ function pl_process_fedora_options () { return $shiftcount } -function pl_makedevs() { +######################################## handling a root image +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)" + exit 1 +} - pl_makedevs $root +function pl_root_mkfedora () { - [ -n "$pl_DISTRO_URL" ] && options="$options -l $pl_DISTRO_URL" - [ -n "$pl_DISTRO_ARCH" ] && options="$options -a $pl_DISTRO_ARCH" - [ -n "$pl_DISTRO_RELEASE" ] && options="$options -r $pl_DISTRO_RELEASE" - # echo "mkfedora -v $options $root" - eval mkfedora -v $options $root -} + echo "* Entering pl_root_mkfedora" "$@" -function pl_setup_chroot() { - root=$1 - shift - options=$@ + if [ $UID -ne 0 ] ; then + echo "Error: You must run this script as root." + exit 1 + fi + +# Verbosity + verbose=0 + +# Release and architecture to install : defaults to current vserver's settings or previously parsed fedora_options + releasever=$pl_DISTRO_RELEASE + basearch=$pl_DISTRO_ARCH + +# Get options +### mirrors="" +### while getopts "l:r:a:vh" opt ; do + while getopts "vh" opt ; do + case $opt in +### l) mirrors="$mirrors $OPTARG" ;; +### r) releasever=$OPTARG ;; +### a) basearch=$OPTARG ;; + v) verbose=1; set -x ;; + h|*) mkfedora_usage ;; + esac + done + + shift $(($OPTIND - 1)) + [[ "$#" -lt 3 ]] && mkfedora_usage + vroot=$1 ; shift + pldistro=$1 ; shift + pkgsfile="$@" + vroot=$(cd $vroot && pwd -P) + [ -d $vroot ] || 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) + # 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 + 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 "$exclude_line" $mirrors ; then + echo xxx -- error ; return 1 + fi + + public_gpg_key=$(yumconf_gpgkey $yum_conf_repos) + + # Do not tolerate errors + set -e + + ## make rpms ignore installing stuff to special fs entries like /proc + # Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 + # 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 + + # Trick rpm and yum, who read the real root /etc/rpm/macros file + # rather than the one installed in the reference image, despite what + # you might expect the --root and --installroot options to mean. Both + # programs always read $HOME/.rpmmacros. + export HOME=$vroot/tmp + mkdir -p $vroot/tmp + pl_root_rpm_macros > $vroot/tmp/.rpmmacros + + function mkfedora_cleanup () { + umount -l $vroot/proc + umount -l $vroot/dev/shm + umount -l $vroot/dev/pts + } + + # Clean up before exiting if anything goes wrong + trap "mkfedora_cleanup" ERR INT + + # Mount in reference image + mount -t devpts none $vroot/dev/pts + 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 + mkdir -p $vroot/usr/share/info + + # Create a dummy /etc/fstab in reference image + mkdir -p $vroot/etc + cat >$vroot/etc/fstab < $vroot/etc/sysconfig/network + + # Initialize RPM database in reference image + mkdir -p $vroot/var/lib/rpm + rpm --root $vroot --initdb + rpm --root $vroot --import $public_gpg_key + + # Initialize yum in reference image + mkdir -p $vroot/var/cache/yum $vroot/var/log + +# yum.conf is for building only - store in different location than /etc/yum.conf + yum_conf=$vroot/etc/mkfedora-yum.conf + cat > $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. + if [ -n "$RPM_BUILD_DIR" ] ; then + 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 < /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" + + 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 $yum_options $exclude_arg install glibc + + # Go, baby, go + 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 $pkgs_packages | grep "not installed" + fi + fi + + if [ -n "$pkgs_groups" ] ; then + ## call yum sequentially to get finer-grained info on dependencies + for grp in $pkgs_groups ; do + echo "* Installing optional group $grp" + yum $yum_options $exclude_arg groupinstall "$grp" + done + fi + + # formerly in bootcd/prep.sh : to optimize footprint + 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 $yum_options clean all + + # Clean RPM state + rm -f $vroot/var/lib/rpm/__db* + + # 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 + 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 + + # Clean up + mkfedora_cleanup + + return 0 +} - pl_mkfedora $root $options +function pl_root_tune_image () { + root=$1; shift # Disable all services in reference image chroot $root sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off" @@ -194,7 +451,7 @@ function pl_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 @@ -213,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 } @@ -240,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 } @@ -264,46 +521,53 @@ 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 "$@" ; } -### # add -p before each package for mkfedora -### function pl_getPackagesOptions2 () { pl_getPackages2 "$@" | awk '{for (i=1;i<=NF;i++) {print "-p " $i}}' ; } -### # add -g before each group for mkfedora -### function pl_getGroupsOptions2 () { pl_getGroups2 "$@" | awk '{for (i=1;i<=NF;i++) {print "-g " $i}}' ; } +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/ function pl_locateDistroFile () { - buildir=$1; shift + builddir=$1; shift pldistro=$1; shift pkgsfile=$1; shift @@ -311,13 +575,14 @@ function pl_locateDistroFile () { # locate it paths="$builddir/config.$pldistro/$pkgsfile $builddir/config.planetlab/$pkgsfile" for path in $paths; do - if [ -f $path/$pkgsfile ] ; then + if [ -f $path ] ; then pkgspath=$path break fi done if [ -z "$pkgspath" ] ; then - echo 1>&2 "pl_locateDistroFile: cannot locate $pkgsfile in $builddir" + 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 @@ -326,3 +591,128 @@ function pl_locateDistroFile () { return 0 fi } + +function yumgroups_from_pkgs () { + 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 + $groupdesc + true + +__group_header + for package in $packages; do + echo "$package" + done + cat << __group_footer + + +__group_footer + done +cat <<__footer + +__footer +} + + +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 +}