[ewg] [PATCH] ofed_1.2_scripts: Different handling of ib-bonding RPM

[Moni Shoua]

Vlad,
I need this patch to close bug 459 (https://bugs.openfabrics.org/show_bug.cgi?id=459)


Add rpmbuild definition and ommit source release from RPM name for ib-bonding.
Signed-off-by: Moni Shoua <monis at voltaire.com>
---

 build.sh   |    5 +++--
 install.sh |    8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index 2a496d2..46e621c 100755
--- a/build.sh
+++ b/build.sh
@@ -888,7 +888,7 @@ #    fi    
 
 ib-bonding()
 {
-    if [[ -z $IB_BONDING_NAME || -z $IB_BONDING_VERSION ]]; then
+    if [[ -z $IB_BONDING_NAME || -z $IB_BONDING_VER ]]; then
         err_echo "Failed to define ib-bonding RPM version"
         return 1
     fi
@@ -896,9 +896,10 @@ ib-bonding()
                 --define \'KVERSION ${K_VER}\' \
                 --define \'_topdir ${RPM_DIR}\' \
                 --define \'_prefix ${STACK_PREFIX}\' \
+		--define \' _release ${RPMK_VER}\' \
                 ${IB_BONDING_SRC_RPM}
     
-    ex "$MV -f ${RPM_DIR}/RPMS/${build_arch}/${IB_BONDING_NAME}-${IB_BONDING_VERSION}*${build_arch}.rpm $RPMS"
+    ex "$MV -f ${RPM_DIR}/RPMS/${build_arch}/${IB_BONDING_NAME}-${IB_BONDING_VER}*${build_arch}.rpm $RPMS"
     let BUILD_COUNTER++
     return 0
 }
diff --git a/install.sh b/install.sh
index e0059ec..27d6a3f 100755
--- a/install.sh
+++ b/install.sh
@@ -357,7 +357,7 @@ is_rpms()
 		esac
             ;;
             ib-bonding)
-                        [ ! -f ${RPMS}/${IB_BONDING_NAME}-${IB_BONDING_VERSION}-${RPMK_VER}.${build_arch}.rpm ] && return 1
+                        [ ! -f ${RPMS}/${IB_BONDING_NAME}-${IB_BONDING_VER}-${RPMK_VER}.${build_arch}.rpm ] && return 1
             ;;
             rds-tools)
 		[ ! -f ${RPMS}/${RDS_TOOLS_NAME}-${RDS_TOOLS_VERSION}.${build_arch}.rpm ] && return 1
@@ -1174,10 +1174,10 @@ openmpi()
 ib-bonding()
 {
 
-    if [ ! -f ${RPMS}/${IB_BONDING_NAME}-${IB_BONDING_VERSION}-${RPMK_VER}.${build_arch}.rpm ]; then
-            err_echo "${RPMS}/${IB_BONDING_NAME}-${IB_BONDING_VERSION}-${RPMK_VER}.${build_arch}.rpm not found under ${RPMS}."
+    if [ ! -f ${RPMS}/${IB_BONDING_NAME}-${IB_BONDING_VER}-${RPMK_VER}.${build_arch}.rpm ]; then
+            err_echo "${RPMS}/${IB_BONDING_NAME}-${IB_BONDING_VER}-${RPMK_VER}.${build_arch}.rpm not found under ${RPMS}."
     else
-            ex "$RPM -Uhv ${RPMS}/${IB_BONDING_NAME}-${IB_BONDING_VERSION}-${RPMK_VER}.${build_arch}.rpm"
+            ex "$RPM -Uhv ${RPMS}/${IB_BONDING_NAME}-${IB_BONDING_VER}-${RPMK_VER}.${build_arch}.rpm"
     fi
 
     return 0