use latest pyaspects

[build.git] / build.common

diff --git a/build.common b/build.common
index 390b6f3..9295f2d 100644 (file)
--- a/build.common
+++ b/build.common
@@ -74,7 +74,7 @@ function pl_getKexcludes () {
     distroname=$1; shift
     case $distroname in
        f*)
-           echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iptables-ipv6 iproute drupal' ;;
+           echo 'kernel kernel-PAE kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iptables-ipv6 iproute drupal' ;;
        centos5)
            echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iproute drupal inotify-tools* libnl' ;;
        *)
@@ -579,10 +579,13 @@ 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}
+    # if config dir is missing but a .svnpath or a .gitpath exists, use it to extract the config dir
+    configdir="$builddir/config.${pldistro}"
+    if [ ! -d $configdir ] ; then
+       if [ -f "${configdir}.svnpath" -o -f "${configdir}.gitpath" ] ; 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
     fi
     # locate it
     paths="$builddir/config.$pldistro/$pkgsfile $builddir/config.planetlab/$pkgsfile"