X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=5086c499ba295fafcada995684d076a007b2ca22;hb=9f5f78a4fd415b12a94d8a40cc4ba4f6d69ce37c;hp=c180d8d992172d604502b2ca6b312035282ccf1b;hpb=4e7b913c44d4312520a0f226e6c7e9b75b00b544;p=build.git

diff --git a/build.common b/build.common
index c180d8d9..5086c499 100644
--- a/build.common
+++ b/build.common
@@ -58,17 +58,20 @@ function pl_getReleaseName () {
     return 0
 }
 
+# on fedora 8 or above, we use libnl from the stock repos
+# on centos5 we build it locally
 function pl_getKexcludes () {
     distroname=$1; shift
     case $distroname in 
-	f*)
-	    echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'
+	f?|f1?)
+	    echo 'kernel* util-vserver* iptables iproute drupal'
 	    ;;
-	centos*)
-	    echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'
+	centos5)
+	    echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl* drupal'
 	    ;;
 	*)
 	    echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh"
+	    exit 1
 	    ;;
     esac
 }
@@ -236,12 +239,12 @@ function pl_root_mkfedora () {
 	mirrors=$(pl_parsePkgs mirror $fcdistro $pldistro $mirrorsfile)
     fi
 
-    exclude_line=""
+    kexclude_line=""
     # add them manually as the output of pl_parsePkgs is line-separated
     if [ -n "$pkgs_kexcludes" ] ; then
-	exclude_line="exclude="
+	kexclude_line="exclude="
 	for kexclude in $pkgs_kexcludes ; do
-	    exclude_line="$exclude_line $kexclude"
+	    kexclude_line="$kexclude_line $kexclude"
 	done
     fi
 
@@ -252,7 +255,7 @@ function pl_root_mkfedora () {
 
     # 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
+    if ! yumconf_mirrors $yum_conf_repos ../build/ $fcdistro "$kexclude_line" $mirrors ; then
 	echo xxx -- error ; return 1
     fi
     
@@ -373,12 +376,14 @@ fi
     # glibc must be specified explicitly for the correct arch to be
     # chosen.
     echo "* Installing glibc"
-    yum $yum_options $exclude_arg install glibc
+    # ignore yum's return code that is basically undefined
+    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
+        # ignore yum's return code that is basically undefined
+	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"
@@ -389,7 +394,8 @@ fi
        ## 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"
+            # ignore yum's return code that is basically undefined
+	    yum $yum_options $exclude_arg groupinstall "$grp" || :
 	done
     fi
 
@@ -408,7 +414,8 @@ fi
 
     # Clean yum cache
     echo "* Cleaning up"
-    yum $yum_options clean all
+    # ignore yum's return code that is basically undefined
+    yum $yum_options clean all || :
 
     # Clean RPM state
     rm -f $vroot/var/lib/rpm/__db*
@@ -574,6 +581,11 @@ function pl_locateDistroFile () {
     pkgsfile=$1; shift
 
     pkgspath=""
+    # if config dir is missing but a .svnpath exists
+    if [[ -f "$builddir/config.${pldistro}.svnpath" && ! -d "$builddir/config.${pldistro}" ]] ; then
+	echo 1>&2 "Invoking make to extract remote config.${pldistro}"
+	make 1>&2 --silent --no-print-directory -C $builddir stage1=true config.${pldistro}
+    fi
     # locate it
     paths="$builddir/config.$pldistro/$pkgsfile $builddir/config.planetlab/$pkgsfile"
     for path in $paths; do
@@ -653,7 +665,7 @@ function yumconf_mirrors () {
     dest_yumconf=$1; shift
     builddir=$1; shift
     fcdistro=$1; shift
-    exclude_line="$1" ; shift
+    kexclude_line="$1" ; shift
     mirrors="$@"
 
     template=$builddir/mirroring/$fcdistro/yum.repos.d/building.repo.in
@@ -665,7 +677,7 @@ function yumconf_mirrors () {
     fi
 
     for mirror in $mirrors; do
-	if yumconf_mirror $dest_yumconf $template "$exclude_line" $mirror; then
+	if yumconf_mirror $dest_yumconf $template "$kexclude_line" $mirror; then
 	    return 0
 	fi
     done
@@ -678,12 +690,12 @@ function yumconf_mirrors () {
 function yumconf_mirror () {
     dest_yumconf=$1; shift
     template=$1; shift
-    exclude_line="$1" ; shift
+    kexclude_line="$1" ; shift
     mirror=$1; shift
 
     sed -e "s,@MIRRORURL@,$mirror,g" \
 	-e "/baseurl=/i\\
-$exclude_line" $template > $dest_yumconf
+$kexclude_line" $template > $dest_yumconf
     
     # capture all lines defining baseurl
     baseurl_defs=$(grep '^baseurl=' $dest_yumconf)
@@ -718,3 +730,12 @@ function yumconf_gpgkey () {
     echo $value
     return 0
 }
+
+# patches a yum conf to insert an exclude line in each declared repo
+function yumconf_exclude () {
+    repo=$1; shift
+    kexclude_line="$1" ; shift
+    
+    sed -i -e "/baseurl=.*$/i\\
+$kexclude_line" $repo
+}