X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Flbuild;h=3abf84612d5d5c9d86131778e073ca2a76b1dc86;hp=987aa79cb2e153028e411bc1d29e033fc328efee;hb=a296e9433919a6d709ae7826ecc5310d9e2d1365;hpb=1d95408cfbacf7462314325996d3cdf087764266

diff --git a/build/lbuild b/build/lbuild
index 987aa79..3abf846 100755
--- a/build/lbuild
+++ b/build/lbuild
@@ -27,7 +27,8 @@ push_exit_trap "kill -INT -$$ || true" kill_children
 #BUILD_GEN=1
 #BUILD_GEN=2	# bz19952: remove -lustre tag from kernel RPM names
 #BUILD_GEN=3	# bz19975: enable the building of src.rpms by default
-BUILD_GEN=4	# bz22281: use the git hash in the kernel extra version
+#BUILD_GEN=4	# bz22281: use the git hash in the kernel extra version
+BUILD_GEN=5	# TT-107: don't cache the BUILD dir
 
 TOPDIR=$PWD
 
@@ -1035,7 +1036,7 @@ build_kernel_ib() {
         rpm --define "_topdir ${TOPDIR}" -ivh $SOURCE
         SOURCE="${TOPDIR}/SPECS/ofa_kernel.spec"
         local file ed_fragment1 ed_fragment2 n=1
-        for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*); do
+        for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*.patch); do
             ed_fragment1="$ed_fragment1
 Patch$n: ${file%%*/}"
             ed_fragment2="$ed_fragment2
@@ -1043,6 +1044,11 @@ Patch$n: ${file%%*/}"
             cp $file ${TOPDIR}/SOURCES
             let n=$n+1
         done
+        for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*.ed); do
+            ed_fragment3="$ed_fragment3
+$(cat $file)"
+            let n=$n+1
+        done
 
         if [ $n -gt 1 ]; then
             ed $SOURCE <<EOF
@@ -1052,6 +1058,7 @@ $ed_fragment1
 /^%setup /a
 $ed_fragment2
 .
+$ed_fragment3
 wq
 EOF
         fi
@@ -1259,7 +1266,7 @@ build_kernel_with_srpm() {
         else
             # store the resulting kernel RPM build tree for future use
             echo "Storing the built kernel for future reuse" >&${outfd}
-            if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \
+            if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,SRPMS,RPMS}" \
                                  "kernel" "$REUSEBUILD" "$REUSE_SIGNATURE" \
                                  "$CAN_LINK_FOR_REUSE"; then
                 error "Failed to store kernel RPMS for reuse"