Merge commit 'local_master/master'

[build.git] / build.common

diff --git a/build.common b/build.common
index 597d0a0..69a4697 100644 (file)
--- a/build.common
+++ b/build.common
@@ -18,7 +18,7 @@ export PATH=.:$PATH
 function pl_getDistro() {
     if [ -f "/etc/redhat-release" ] ; then
        distro=$(awk ' { print $1 } ' /etc/redhat-release)
-       case $distro in Red*) distro="Redhat" ; esac
+       case $distro in Scientific*) distro="SL" ; esac
     else
        echo "build.common.pl_getDistro-unknown"
        exit 1
@@ -30,7 +30,7 @@ function pl_getDistro() {
 # 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 ; if ($1=="Red") print $6 } ' /etc/redhat-release)
+       release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 ; if ($1=="Scientific") print $4 } ' /etc/redhat-release)
     else
        echo "build.common.pl_getRelease-unknown"
        exit 1
@@ -48,9 +48,6 @@ function pl_getReleaseName () {
        [Ff]edora*)
            releasename=f$release
            ;;
-       [Re]edhat*)
-           releasename=rhel6
-           ;;
        [Cc]entOS*)
            old_IFS="$IFS"
            IFS="."
@@ -58,6 +55,9 @@ function pl_getReleaseName () {
            IFS="$old_IFS"
            releasename=centos$1
            ;;
+       [Ss]cientific*)
+           releasename=sl$release
+           ;;
        *)
            releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common"
            echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" 
@@ -180,7 +180,7 @@ function pl_root_makedevs() {
     mknod -m 600 $vroot/dev/net/tun c 10 200
 
     # For mkinitrd (in case a kernel is being installed)
-    # As well for loop back mounting within a vserver. 
+    # As well as for loop back mounting within a vserver. 
     for i in $(seq 0 255) ; do
        mknod -m 640 $vroot/dev/loop$i b 7 $i
     done
@@ -330,6 +330,7 @@ cachedir=/var/cache/yum
 debuglevel=2
 logfile=/var/log/yum.log
 pkgpolicy=newest
+multilib_policy=best
 distroverpkg=redhat-release
 tolerant=1
 exactarch=1
@@ -414,23 +415,21 @@ fi
     # Clean yum cache
     echo "* Cleaning up"
 
-    # NOTE: this hack is for Fedora >= 12. we'll let kernel-debug
-    # package satisfy dependencies to install a base system. Then
-    # we'll link to our version of kernel/initrd and clean up
+    # NOTE: this hack is for Fedora >= 12.
+    # if kernel-debug is installed, clean it up
+    # we link to our version of kernel/initrd and clean up
     # kernel-debug manually
-#    set -x
-    pushd $vroot/boot/
-    # we let kernel-debug to be installed to satisfy dependencies. it's time to clean up.
     if rpm --root $vroot --quiet -q kernel-debug ; then
        echo "* Cleaning up kernel-debug - (workaround for f12)"
+       pushd $vroot/boot/
         rm -rf kernel-boot kernel-bootsmp initrd-boot initrd-bootsmp
         ln -s vmlinuz-*${pldistro}* kernel-boot
         ln -s vmlinuz-*${pldistro}* kernel-bootsmp
         ln -s initrd-*${pldistro}* initrd-boot
         ln -s initrd-*${pldistro}* initrd-bootsmp
         rpm --root $vroot --nodeps -e kernel-debug || :
+       popd
     fi
-    popd
 
     # ignore yum's return code that is basically undefined
     yum $yum_options clean all || :