X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=d45df3c7255ecaf43c47594ae57013e64a2736c9;hb=695c71891b9a7f840697aea43bcf9473c86a5e36;hp=6c5b199bf2ccec7e89bad48691ce4c61d0b7c4ef;hpb=e4d47dbbc4dba4a4ec401767456d2155a216f55b;p=build.git

diff --git a/build.common b/build.common
index 6c5b199b..d45df3c7 100644
--- a/build.common
+++ b/build.common
@@ -79,9 +79,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)
 
@@ -125,7 +122,16 @@ function pl_process_fedora_options () {
 }
 
 ######################################## handling a root image
-function pl_makedevs() {
+function pl_root_rpm_macros () {
+    cat <<EOF
+%_install_langs C:en_US:en
+%_netsharedpath /proc:/dev/pts:/usr/share/info
+%_excludedocs 1
+%__file_context_path /dev/null
+EOF
+}
+
+function pl_root_makedevs() {
     vroot=$1
     # Clean ${vroot}/dev, but only when ${vroot}!=""
     [ -n $vroot ] && rm -rf $vroot/dev
@@ -163,260 +169,200 @@ function pl_makedevs() {
     done
 }
 
-function mkfedora_usage()
-{
-    echo "Usage: mkfedora [OPTION]... [basedir]"
-    echo "	-l url		Fedora mirror location. Defaults to try:"
-    for mirror in "${mirrors[@]}" ; do
-	echo "			$mirror"
-    done
-    echo "	-f pkgsfile	use this pkgs file for packages, groups, excludes.."
-    echo "	-k		Exclude kernel* packages from all repositories except bootstrap"
+function mkfedora_usage() {
+    echo "Usage: pl_root_mkfedora [OPTION]... basedir pldistro pkgsfile(s)"
+    echo "	-l url		Fedora mirror location."
+    echo "                      Defaults are searched in <pldistro>.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
 }
 
-function mkfedora () {
+function pl_root_mkfedora () {
 
-echo "* Entering mkfedora " "$@"
+    echo "* Entering pl_root_mkfedora" "$@"
 
-# Verbosity
-verbose=0
-
-# Default yum repositories to try
-mirrors=(
-file:///data/fedora
-http://localhost/fedora
-http://build.planet-lab.org/fedora
-http://coblitz.codeen.org/coblitz.planet-lab.org/pub/fedora
-ftp://mirror.cs.princeton.edu/pub/mirrors/fedora
-ftp://mirror.stanford.edu/pub/mirrors/fedora
-ftp://rpmfind.net/linux/fedora
-)
-
-# Release and architecture to install
-releasever=7
-basearch=i386
-
-# 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=
-
-# PlanetLab development environment
-if [ -f /etc/planetlab/plc_config ] ; then
-    . /etc/planetlab/plc_config
-    if [ -n "$PLC_DEVEL_FEDORA_URL" ] ; then
-	echo "* mkfedora : setting mirrors from /etc/planetlab/config"
-	mirrors=($PLC_DEVEL_FEDORA_URL)
+    if [ $UID -ne 0 ] ; then
+	echo "Error: You must run this script as root."
+	exit 1
     fi
-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
-while getopts "l:r:a:g:p:x:f:kvh" opt ; do
-    case $opt in
-	l)
-	    if echo $OPTARG | grep -q -i '^\(file\|http[s]*\)://' ; then
-		mirrors=($OPTARG)
-	    else
-		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
-	    ;;
-    esac
-done
+    mirrors=""
+    while getopts "l:r:a: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))
-if [ ! -d "$1" ] ; then
-    mkfedora_usage
-fi
+    shift $(($OPTIND - 1))
+    [[ "$#" -lt 3 ]] && mkfedora_usage
+    vroot=$1 ; shift
+    pldistro=$1 ; shift
+    pkgsfile="$@"
+    vroot=$(cd $vroot && pwd -P)
+    [ -d $vroot ] || mkfedora_usage
 
-vroot=$(cd $1 && pwd -P)
 
-if [ $UID -ne 0 ] ; then
-    echo "Error: You must run this script as root."
-    exit 1
-fi
+    # 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
 
-function mkfedora_fetch ()
-{
-    curl --fail --silent --max-time 60 "$1"
-}
+    exclude_kernel=""
+    [ -n "$pkgs_kexcludes" ] && exclude_kernel="exclude=$pkgs_excludes"
+
+    function mkfedora_fetch ()
+    {
+	curl --fail --silent --max-time 60 "$1"
+    }
 
-# hard to find two mirrors with a similar layout
-# set list of attempted locations according to releasever
-if [ $releasever -ge 7 ] ; then
-    attempts="
+    # 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
-"
-fi
+    else
+	attempts="
+	linux/core/$releasever/$basearch/os 
+	core/$releasever/$basearch/os 
+	$releasever/$basearch/os
+	"
+    fi
 
-echo "$0: candidate mirrors"
-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
+    echo "$0: candidate mirrors"
+    for mirror in $mirrors ; do
+	echo "* candidate mirror $mirror"
     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
+    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
-    echo
-    mkfedora_usage
-fi
 
-# this used to be for when mkfedora was called within myplc 
-# that is, when the bootcd was recomputed from scratch
-### exec 3>&1
-### exec 4>&2
-### if [ $verbose -eq 0 ] ; then
-###     exec 1>/dev/null
-###     exec 2>/dev/null
-### fi
-
-# 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
-cat > $vroot/etc/rpm/macros <<EOF
-%_install_langs C:en_US:en
-%_netsharedpath /proc:/dev/pts
-%_excludedocs 1
-%__file_context_path /dev/null
-EOF
-
-# 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
-cp $vroot/etc/rpm/macros $vroot/tmp/.rpmmacros
-
-### Checking whether this is really needed
-### # copy to the vserver's rpm macros
-### # xxx fixme - this must be reviewed once we get the stuff running
-### cp $vroot/etc/rpm/macros /etc/rpm/macros 
-
-# 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
-
-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
-
-# 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
+    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
+    else
+	echo "* selecting mirror with baseurl=$baseurl"
+    fi
 
-# Create a dummy /etc/fstab in reference image
-mkdir -p $vroot/etc
-cat >$vroot/etc/fstab <<EOF
+    # 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 <<EOF
 # This fake fstab exists only to please df and linuxconf.
 /dev/hdv1	/	ext2	defaults	1 1
 EOF
-cp $vroot/etc/fstab $vroot/etc/mtab
+    cp $vroot/etc/fstab $vroot/etc/mtab
 
-# Necessary for some scripts
-mkdir -p $vroot/etc/sysconfig
-echo "NETWORKING=yes" > $vroot/etc/sysconfig/network
+    # Necessary for some scripts
+    mkdir -p $vroot/etc/sysconfig
+    echo "NETWORKING=yes" > $vroot/etc/sysconfig/network
 
-# 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
+    # 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
 
-# Initialize yum in reference image
-mkdir -p $vroot/var/cache/yum $vroot/var/log
-if [ $releasever -lt 7 ] ; then
+    # Initialize yum in reference image
+    mkdir -p $vroot/var/cache/yum $vroot/var/log
+    if [ $releasever -lt 7 ] ; then
 	corename="Core "
-else
+    else
 	corename=""
-fi
+    fi
 
-cat >$vroot/etc/yum.conf <<EOF
+    cat >$vroot/etc/yum.conf <<EOF
 [main]
 cachedir=/var/cache/yum
 debuglevel=2
@@ -438,47 +384,36 @@ baseurl=$baseurl/
 $exclude_kernel
 EOF
 
-for optional in updates extras ; do
-    for optionalurl in \
-	$mirror/linux/core/$optional/$releasever/$basearch \
-	$mirror/core/$optional/$releasever/$basearch \
-	$mirror/linux/$optional/$releasever/$basearch \
-	$mirror/$optional/$releasever/$basearch ; do
-        if mkfedora_fetch $optionalurl/repodata/repomd.xml ; then
-	    cat >>$vroot/etc/yum.conf <<EOF
+    for optional in updates extras ; do
+	for optionalurl in \
+	    $mirror/linux/core/$optional/$releasever/$basearch \
+	    $mirror/core/$optional/$releasever/$basearch \
+	    $mirror/linux/$optional/$releasever/$basearch \
+	    $mirror/$optional/$releasever/$basearch ; do
+            if mkfedora_fetch $optionalurl/repodata/repomd.xml ; then
+		cat >>$vroot/etc/yum.conf <<EOF
 
 [$(basename $optional)]
 name=Fedora ${corename}${releasever} - $basearch - $(basename $optional)
 baseurl=$optionalurl/
 $exclude_kernel
 EOF
-	    break
-	fi
+                break
+	    fi
+	done
     done
-done
-
-# 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)
-    # 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"
+
+    # 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
-	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 <<EOF
+	cat >>$vroot/etc/yum.conf <<EOF
 
 [bootstrap]
 name=Bootstrap - $basearch - $RPM_RPMS_DIR/
@@ -486,126 +421,73 @@ baseurl=file://$RPM_RPMS_DIR/
 EOF
 fi
 
-# pkgs file
-if [ -n "$pkgsfile" ] ; then
-    # parse pkgsfile and add to local vars
-    fcdistro=$(pl_getReleaseName "Fedora" $releasever)
-    for i in $(pl_parsePkgs package $fcdistro $pkgsfile)  ; do
-	packages[${#packages[*]}]="$i"
-    done
-    for i in $(pl_parsePkgs group $fcdistro $pkgsfile) ; do
-	groups[${#groups[*]}]="$i"
-    done
-    for i in $(pl_parsePkgs exclude $fcdistro $pkgsfile) ; do
-	exclude[${#exclude[*]}]="$i"
+    exclude_arg=""
+    for exclude in $pkgs_excludes; do
+	exclude_arg="$exclude_arg --exclude $exclude"
     done
-    junk=$(pl_parsePkgs junk $fcdistro $pkgsfile)
-    precious=$(pl_parsePkgs precious $fcdistro $pkgsfile)
-fi
-
-excludes=
-for package in "${exclude[@]}" ; do
-    excludes="$excludes --exclude=$package"
-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
-
-# 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
-       echo "* Warning: Missing packages"
-       rpm --root $vroot -q "${packages[@]}" | grep "not installed"
-   fi
-fi
-
-if [ ${#groups[*]} -gt 0 ] ; then
-   ## call yum sequentially to get finer-grained info on dependencies
-   for grp in "${groups[@]}" ; do
-      echo "* Installing optional group $grp" 
-      yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \
-	groupinstall "$grp"
-   done
-fi
 
-# 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
+    # glibc must be specified explicitly for the correct arch to be
+    # chosen.
+    echo "* Installing glibc"
+    yum -c $vroot/etc/yum.conf --installroot=$vroot -y $exclude_arg install glibc
+
+    # Go, baby, go
+    if [ -n "$pkgs_packages" ] ; then
+	echo "* Installing optional packages" $pkgs_packages
+	yum -c $vroot/etc/yum.conf --installroot=$vroot -y $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
-    done
-fi
-
-# Clean yum cache
-echo "* Cleaning up"
-yum -c $vroot/etc/yum.conf --installroot=$vroot -y 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
-
-# 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
+    fi
 
-# Restore precious files
-[ -n "$precious" ] && tar -xpf precious.tar && rm -f precious.tar
+    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 -c $vroot/etc/yum.conf --installroot=$vroot -y $exclude_arg \
+		groupinstall "$grp"
+	done
+    fi
 
-popd
+    # 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
 
-# remove trap handler, as we are about to call it directly.
-trap - ERR INT
+    # Clean yum cache
+    echo "* Cleaning up"
+    yum -c $vroot/etc/yum.conf --installroot=$vroot -y clean all
 
-# Clean up
-mkfedora_cleanup
+    # Clean RPM state
+    rm -f $vroot/var/lib/rpm/__db*
 
-return 0
-}
+    # 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
 
-function pl_mkfedora() {
-    root=$1
-    shift
-    options=$@
+    # remove trap handler, as we are about to call it directly.
+    trap - ERR INT
 
-    pl_makedevs $root
+    # Clean up
+    mkfedora_cleanup
 
-    [ -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"
-    mkfedora -v $options $root
+    return 0
 }
 
-function pl_setup_chroot() {
+function pl_root_tune_image () {
     root=$1; shift
-    options="$@"
-
-    pl_mkfedora $root $options
 
     # Disable all services in reference image
     chroot $root sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off"
@@ -618,7 +500,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
@@ -637,7 +519,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
 }
 
@@ -664,7 +546,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
 }
@@ -688,37 +570,47 @@ 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
+    grep -v '^#' $file | grep --regexp="^${keyword}:" | sed -e "s,${keyword}:,,"
+}
+
 # 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/<pldistro>/, then in build/planetlab/
@@ -747,3 +639,52 @@ function pl_locateDistroFile () {
 	return 0
     fi
 }
+
+# experimental
+function yumgroups_from_pkgs () {
+    builddir=$1; shift
+    pldistro=$1; shift
+    fcdistro=$1; shift
+    pkgsnames=$@
+
+sedargs="-e s,@FCDISTRO@,$fcdistro,g"
+
+   cat <<__header
+<?xml version="1.0"?>
+<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
+<comps>
+__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
+  <group>
+    <id>$(echo $groupname|tr A-Z a-z)</id>
+    <name>$groupname</name>
+    <default>true</default>
+    <description>$groupdesc</description>
+    <uservisible>false</uservisible>
+    <packagelist>
+__group_header
+        for package in $packages; do 
+	    echo "<packagereq type=\"mandatory\">$package</packagereq>"
+	done
+	cat << __group_footer
+    </packagelist>
+  </group>
+__group_footer
+    done
+cat <<__footer
+</comps>
+__footer
+}