X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=72b166ca90cca3662ce6c5c238fd4a063e445660;hb=8e8cef2a566b3bc51d55e2a506ec680a276b1ed1;hp=217fa1a29e52f9d7b64d83df20e5bd728a919978;hpb=aca5afbf22873bcd9d90a5da0db4f65b93babc0a;p=build.git

diff --git a/build.common b/build.common
index 217fa1a2..72b166ca 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)
 
@@ -172,37 +169,15 @@ function pl_root_makedevs() {
     done
 }
 
-# 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
-    )
-
 function mkfedora_usage() {
-    echo "Usage: pl_root_mkfedora [OPTION]... basedir"
-    echo "	-l url		Fedora mirror location. Default is 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"
+    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
 }
 
@@ -221,32 +196,13 @@ 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
 	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 <fcdistro> $(pl_locateDistroFile ../build/ <pldistro> $OPTARG.mirrors)))
-		    mirrors=(file://$OPTARG)
-		fi
+		mirrors="$mirrors $OPTARG"
 		;;
 	    r)
 		releasever=$OPTARG
@@ -254,21 +210,6 @@ function pl_root_mkfedora () {
 	    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
@@ -280,39 +221,93 @@ function pl_root_mkfedora () {
     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
 
+
+    # 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_kernel=""
+    # add them manually as the output of pl_parsePkgs is line-separated
+    if [ -n "$pkgs_kexcludes" ] ; then
+	exclude_kernel="exclude="
+	for kexclude in $pkgs_kexcludes ; do
+	    exclude_kernel="$exclude_kernel $kexclude"
+	done
+    fi
+
     function mkfedora_fetch ()
     {
 	curl --fail --silent --max-time 60 "$1"
     }
 
-    # set list of attempted locations according to releasever
-    if [ $releasever -ge 7 ] ; then
-	attempts="
+    # set list of attempted locations according to target distro
+    # xxx all this should go into mirroring/ somehow
+    case $pl_DISTRO in
+	Fedora)
+	    if [ $releasever -ge 7 ] ; then
+	        # Plain Fedora comes with a new layout
+		attempts="
+fedora/releases/$releasever/Everything/$basearch/os
 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
+		# Fedora Core
+		attempts="
+fedora/core/$releasever/$basearch/os 
+linux/core/$releasever/$basearch/os 
+core/$releasever/$basearch/os 
+$releasever/$basearch/os
+"
+	    fi 
+	    public_gpg_key=RPM-GPG-KEY-fedora
+	    ;;
+	CentOS)
+	    # xxx hacky for now
+	    # you can use vbuild-fedora-mirror with -f centos5.1
+	    # which is hard-coded in mirroring/centos as well
+	    # for now I do the mapping here, mmhh
+	    case $releasever in
+		4) actual=4.6 ;;
+		5) actual=5.1 ;;
+		*) actual=$releasever ;;
+	    esac
+	    attempts="
+centos/$actual/os/$basearch
+"
+	    public_gpg_key=RPM-GPG-KEY-CentOS-$releasever
+	    ;;
+	*)
+	    echo "distro $pl_DISTRO not supported in build.common / mkfedora" ; exit 1
+    esac
 
     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 mirror in $mirrors ; do
 	for attempt in $attempts; do 
 	    attempturl=$mirror/$attempt
 	    if mkfedora_fetch $attempturl/repodata/repomd.xml >/dev/null ; then
@@ -326,7 +321,7 @@ linux/core/$releasever/$basearch/os
 	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 mirror in $mirrors ; do
 	    for attempt in $attempts ; do
 		echo $mirror/$attempt
 	    done
@@ -390,7 +385,7 @@ 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 $baseurl/$public_gpg_key
 
     # Initialize yum in reference image
     mkdir -p $vroot/var/cache/yum $vroot/var/log
@@ -444,20 +439,8 @@ EOF
     # 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
@@ -471,84 +454,48 @@ 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"
-	done
-	junk=$(pl_parsePkgs junk $fcdistro $pkgsfile)
-	precious=$(pl_parsePkgs precious $fcdistro $pkgsfile)
-    fi
-
-    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 -c $vroot/etc/yum.conf --installroot=$vroot -y $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 -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 "${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 \
+	    yum -c $vroot/etc/yum.conf --installroot=$vroot -y $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"
@@ -572,12 +519,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"
@@ -667,18 +610,20 @@ function pl_getPkgsAttribute () {
     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
@@ -692,13 +637,13 @@ function pl_parsePkgs () {
 	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/
@@ -745,7 +690,7 @@ __header
 
     for pkgsname in $pkgsnames; do
 	pkgsfile=$(pl_locateDistroFile $builddir $pldistro $pkgsname)
-	packages=$(pl_getPackages $fcdistro $pkgsfile)
+	packages=$(pl_getPackages $fcdistro $pldistro $pkgsfile)
 
 	groupname=$(pl_getPkgsAttribute groupname $pkgsfile | sed $sedargs)
 	groupdesc=$(pl_getPkgsAttribute groupdesc $pkgsfile | sed $sedargs)
@@ -776,5 +721,3 @@ cat <<__footer
 </comps>
 __footer
 }
-
-