Tagging module Monitor - Monitor-3.0-6

[build.git] / build.common

diff --git a/build.common b/build.common
index 58d0aa3..5086c49 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
 }
@@ -375,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"
@@ -391,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
 
@@ -410,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*
@@ -576,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
@@ -722,11 +732,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
 }