monitor both 22 and 27

[build.git] / build.common

diff --git a/build.common b/build.common
index 305b228..8d2e664 100644 (file)
--- a/build.common
+++ b/build.common
@@ -58,16 +58,16 @@ 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 
        f?|f1?)
-           echo 'kernel* util-vserver* iptables iproute'
+           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"
@@ -578,8 +578,9 @@ function pl_locateDistroFile () {
 
     pkgspath=""
     # if config dir is missing but a .svnpath exists
-    if [[ -f "$builddir/config.${pldistro}.svpath" && ! -d "$builddir/config.${pldistro}" ]] ; then
-       make -C $builddir stage1=true config.${pldistro}
+    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"