add NodeManage-topo to the modules to monitor

[build.git] / build.common

diff --git a/build.common b/build.common
index 69a4697..bb0e479 100644 (file)
--- a/build.common
+++ b/build.common
@@ -55,7 +55,7 @@ function pl_getReleaseName () {
            IFS="$old_IFS"
            releasename=centos$1
            ;;
-       [Ss]cientific*)
+       [Ss]L*)
            releasename=sl$release
            ;;
        *)
@@ -82,6 +82,8 @@ function pl_getKexcludes () {
            echo 'kernel kernel-PAE kernel-PAEdebug 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' ;;
+       sl*)
+           echo 'kernel kernel-debug kernel-debug-devel kernel-devel kernel-doc kernel-firmware kernel-headers iptables iproute' ;;
        *)
            echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh" ; exit 1 ;;
     esac
@@ -382,6 +384,7 @@ fi
     if [ -n "$pkgs_packages" ] ; then
        echo "* Installing optional packages" $pkgs_packages
         # ignore yum's return code that is basically undefined
+        echo "* Install options" $vroot $yum_options 
        yum $yum_options install $pkgs_packages || :
        if ! rpm --root $vroot -q $pkgs_packages >/dev/null ; then
            echo "* Warning: Missing packages"
@@ -547,6 +550,7 @@ function pl_parsePkgs () {
     fcdistro=$1; shift
     pldistro=$1; shift
 
+    echo 1>&2 "pl_parsePkgs: using -a $target_arch -f $fcdistro -d $pldistro $keyword $@"
     pkgs.py -a $target_arch -f $fcdistro -d $pldistro $keyword "$@" 
 }
 # usage: pl_getPackages [-a arch] fcdistro pldistro pkg-file[..s]
@@ -744,15 +748,13 @@ $kexclude_line" $template > $dest_yumconf
     return 0
 }
 
-# from a yum.conf as generated above, computes the (first) gpgkey url
+# from a yum.conf as generated above, computes the gpgkey urls
 function yumconf_gpgkey () {
     dest_yumconf=$1; shift
 
-    first_line=$(grep '^gpgkey=' $dest_yumconf | head -1)
-    values=$(echo $first_line | sed -e s,gpgkey=,,)
-    value=$(echo $values | awk '{print $1;}' | sed -e 's,$basearch,'"$pl_DISTRO_ARCH",g)
-    [ -n "$value" ] || return 1
-    echo $value
+    values=$(grep -h '^gpgkey=' $dest_yumconf | sed -e s,gpgkey=,, | sed -e 's,$basearch,'"$pl_DISTRO_ARCH",g | sed -e 's, ,\n,g' | sort | uniq | xargs)
+    [ -n "$values" ] || return 1
+    echo $values
     return 0
 }