LU-9174 kernel: kernel update RHEL7.3 [3.10.0-514.10.2.el7]

[fs/lustre-release.git] / contrib / lbuild / lbuild-rhel

diff --git a/contrib/lbuild/lbuild-rhel b/contrib/lbuild/lbuild-rhel
index efb5c81..8f20270 100644 (file)
--- a/contrib/lbuild/lbuild-rhel
+++ b/contrib/lbuild/lbuild-rhel
@@ -102,7 +102,7 @@ prepare_and_build_srpm() {
     rpmbuildopt="$rpmbuildopt $(get_rpmbuildopts)"
 
     # now build it
-    if ! eval $RPMBUILD $rpmbuildopt $targets --with baseonly \
+    if ! eval rpmbuild $rpmbuildopt $targets --with baseonly \
                    --define \"_topdir $TOPDIR\" \
                    --define \"buildid $buildid\" \
                    --define \"_tmppath $TMPDIR\" \
@@ -159,12 +159,6 @@ find_linux_devel_paths() {
     LINUX=$path/usr/src/kernels/${lnxmaj}${lnxmin}-${lnxrel}${DEVEL_PATH_ARCH_DELIMETER:-"-"}${ARCH}
     # RHEL doesn't have the -obj tree
     LINUXOBJ=""
-    # XXX - i don't think we need this any more
-    #LINUXRELEASE=$(find_linux_release "$LINUX")
-    #if [ -z "$LINUXRELEASE" ]; then
-    #    echo "Failed to find linux release in $LINUX"
-    #    return 255
-    #fi
 
     return 0
 }
@@ -188,7 +182,7 @@ unpack_linux_devel_rpm-rhel() {
 find_linux_rpm-rhel() {
     local prefix="$1"
     local wanted_kernel="$2"
-    local pathtorpms=${3:-"${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}/${TARGET_ARCH}"}
+    local pathtorpms=${3:-"$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH"}
 
     local tmpdir=$(mktemp -d $pathtorpms/yumXXXXXX)
     local sudo=""
@@ -206,3 +200,8 @@ find_linux_rpm-rhel() {
     return 0
 
 }
+
+# This function digs out the linux release from the linux source tree
+find_linux_release() {
+       _find_linux_release $LINUX
+}