X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild-rhel;h=a2b0475790a729d2ee5494027d4182b0fefe255e;hp=3a7d3786d0ceca9a33884102a966bdd7da34b4e8;hb=bebfcbf008e6b1bc566c3abebf46fefbe6c8b5e8;hpb=a61dd04bf9c36afa56cdb3746b4102baff6dc77d

diff --git a/contrib/lbuild/lbuild-rhel b/contrib/lbuild/lbuild-rhel
index 3a7d378..a2b0475 100644
--- a/contrib/lbuild/lbuild-rhel
+++ b/contrib/lbuild/lbuild-rhel
@@ -6,7 +6,8 @@
 # in build/lbuild)
 #BUILD_GEN+=".0"
 #BUILD_GEN+=".1"	# refactor both rhel5 and rhel6
-BUILD_GEN+=".0"	# TT-107: don't cache the BUILD dir (reset major to 5)
+#BUILD_GEN+=".0"	# TT-107: don't cache the BUILD dir (reset major to 5)
+BUILD_GEN+=".2"	# LU-9850
 
 DEVEL_KERNEL_TYPE="devel"
 RPM_HELPERS_DIR="/usr/lib/rpm/redhat"
@@ -21,7 +22,11 @@ get_rpmbuildopts() {
 # patching common to all releases
 patch_spec_common() {
 
-    sed -i -e '/find $RPM_BUILD_ROOT\/lib\/modules\/$KernelVer/a\
+    sed -i -e '/Provides: kernel-uname-r =/a\
+Provides: kernel-lustre = %{KVRA}%{?1:.%{1}}\\' \
+           -e '/Provides: kernel-devel-uname-r =/a\
+Provides: kernel-devel-lustre = %{KVRA}%{?1:.%{1}}\\' \
+           -e '/find $RPM_BUILD_ROOT\/lib\/modules\/$KernelVer/a\
     cp -a fs/ext3/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/fs/ext3 \
     cp -a fs/ext4/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/fs/ext4' \
           SPECS/$SPEC_NAME 2>&1 || \
@@ -102,7 +107,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 +164,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 +187,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=""