LU-8383 build: Spec file cleanup after LU-5614

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

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 725cdf1..83a40e5 100755 (executable)
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -838,7 +838,7 @@ build_lustre() {
 
     # move RPMs into place where they are expected to be
     for arch in $BUILD_ARCHS; do
-        mv -f lustre-*.${arch}.rpm $TOPDIR/RPMS/${arch}/
+        mv -f *lustre*.${arch}.rpm $TOPDIR/RPMS/${arch}/
     done
     mv -f lustre-*.src.rpm $TOPDIR/SRPMS/
 
@@ -957,6 +957,7 @@ build_spl_zfs() {
             echo "Building RPMs from $pkg/$specdir/$spec"
             if ! rpmbuild $rpmb $pkg/$specdir/$spec \
                 --nodeps -v \
+                --define "_use_internal_dependency_generator 0" \
                 --define "require_kdir ${LINUX}" \
                 ${LINUXOBJ:+--define "require_kobj ${LINUXOBJ}"} \
                 ${spldir:+--define "require_spldir ${spldir}"} \
@@ -1602,6 +1603,7 @@ EOF
 set -x
 .
 g/\/.*\/\(symset-table\)/s//$tmp\/\1/g
+g/\(\/usr\/src\/kernels\/\)/s//$tmp\/reused\1/g
 wq
 EOF
     ed symset-table <<EOF