oops - monitor the right branch of NodeManager

[build.git] / build.common

diff --git a/build.common b/build.common
index 58d0aa3..8d2e664 100644 (file)
--- a/build.common
+++ b/build.common
@@ -58,19 +58,20 @@ function pl_getReleaseName () {
     return 0
 }
 
-# on fedora 8 or 9, we use libnl from the stock repos
+# 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|f9)
-           echo 'kernel* util-vserver* iptables iproute'
+       f?|f1?)
+           echo 'kernel* util-vserver* iptables iproute drupal'
            ;;
        centos5)
-           echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'
+           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
 }
@@ -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
@@ -722,11 +728,10 @@ function yumconf_gpgkey () {
 }
 
 # patches a yum conf to insert an exclude line in each declared repo
-function yumconf_exclude_all_repos () {
+function yumconf_exclude () {
     repo=$1; shift
     kexclude_line="$1" ; shift
     
     sed -i -e "/baseurl=.*$/i\\
-$kexclude_line\\
-" $repo
+$kexclude_line" $repo
 }