oops - monitor the right branch of NodeManager

[build.git] / build.common

diff --git a/build.common b/build.common
index 30c3c0e..8d2e664 100644 (file)
--- a/build.common
+++ b/build.common
@@ -58,19 +58,20 @@ function pl_getReleaseName () {
     return 0
 }
 
-# we use libnl from fedora 9 stock;
-# on f8 and centos5 we build it locally
+# 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 
-       f8|centos5)
-           echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'
+       f?|f1?)
+           echo 'kernel* util-vserver* iptables iproute drupal'
            ;;
-       f9)
-           echo 'kernel* util-vserver* iptables iproute inotify-tools*'
+       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
 }
@@ -238,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
 
@@ -254,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
     
@@ -576,6 +577,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
@@ -655,7 +661,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
@@ -667,7 +673,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
@@ -680,12 +686,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)
@@ -720,3 +726,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
+}