Setting tag MyPLC-4.3-35

[build.git] / build.common

diff --git a/build.common b/build.common
index 97b334c..3d5c703 100644 (file)
--- a/build.common
+++ b/build.common
@@ -1,16 +1,17 @@
 # -*-Shell-script-*-
 #
+# $Id$
+# $URL$
+#
 # Common functions for build scripts used by various packages
 # incorporated (e.g., build, myplc, myplc-devel, vserver-reference)
 #
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2007 The Trustees of Princeton University
 #
-# $Id$
+# supported distros f8, f10, f12, centos5
 #
-
-# support for fedora and centos only for now
-
+# returns 'Fedora' or 'CentOS' for now
 function pl_getDistro() {
     if [ -f "/etc/redhat-release" ] ; then
        distro=$(awk ' { print $1 } ' /etc/redhat-release)
@@ -22,6 +23,7 @@ function pl_getDistro() {
     return 0
 }
 
+# returns something like 8, 10, or 5.3
 function pl_getRelease() {
     if [ -f "/etc/redhat-release" ] ; then
        release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 } ' /etc/redhat-release)
@@ -33,7 +35,7 @@ function pl_getRelease() {
     return 0
 }
 
-# vserver expects something like f8 or centos5
+# returns stuff for vserver, i.e. something like 'f8' or 'centos5'
 function pl_getReleaseName () {
     distro=$1; shift
     release=$1; shift
@@ -58,21 +60,17 @@ 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'
-           ;;
+    case $distroname in
+       f*)
+           echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iptables-ipv6 iproute drupal' ;;
        centos5)
-           echo 'kernel* util-vserver* iptables iproute inotify-tools* libnl*'
-           ;;
+           echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iproute drupal inotify-tools* libnl' ;;
        *)
-           echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh"
-           exit 1
-           ;;
+           echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh" ; exit 1 ;;
     esac
 }
 
@@ -259,11 +257,11 @@ function pl_root_mkfedora () {
        echo xxx -- error ; return 1
     fi
     
-    public_gpg_key=$(yumconf_gpgkey $yum_conf_repos)
-
     # Do not tolerate errors
     set -e
 
+    public_gpg_key=$(yumconf_gpgkey $yum_conf_repos)
+
     ## make rpms ignore installing stuff to special fs entries like /proc
     # Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
     # you have to use at least one language beside 'C'
@@ -363,7 +361,7 @@ fi
     echo "========== EndDump $yum_conf"
 
     yum_options=""
-    yum --help | grep verbose &> /dev/null && yum_options="$yum_options --verbose"
+#    yum --help | grep verbose &> /dev/null && yum_options="$yum_options --verbose"
     yum_options="$yum_options -y"
     yum_options="$yum_options -c $yum_conf"
     yum_options="$yum_options --installroot=$vroot"
@@ -376,12 +374,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"
@@ -390,9 +390,11 @@ fi
 
     if [ -n "$pkgs_groups" ] ; then
        ## 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"
+       for group_plus in $pkgs_groups ; do
+           group=$(echo $group_plus | sed -e "s,+++, ,g")
+           echo "* Installing optional group $group" 
+            # ignore yum's return code that is basically undefined
+           yum $yum_options $exclude_arg groupinstall "$group" || :
        done
     fi
 
@@ -411,7 +413,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*
@@ -677,6 +680,7 @@ function yumconf_mirrors () {
            return 0
        fi
     done
+    echo 'yumconf_mirrors in build.common : ran out of mirrors -- BAILING OUT'
     rm -f $dest_yumconf
     return 1
 }