LU-8519 build: make SLES use lbuild kernel-devel

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

diff --git a/contrib/lbuild/lbuild-rhel7 b/contrib/lbuild/lbuild-rhel7
index ea339a0..d831430 100644 (file)
--- a/contrib/lbuild/lbuild-rhel7
+++ b/contrib/lbuild/lbuild-rhel7
@@ -15,7 +15,7 @@ USE_KABI=true
 # in kernel version and rpm names
 #
 RMAC=$HOME/.rpmmacros
-grep '%dist' $RMAC &> /dev/null || echo '%dist .el7' >> $RMAC
+grep '^%dist' $RMAC &> /dev/null || echo '%dist .el7' >> $RMAC
 
 # We modify the RHEL7 kmodtool script, because it expects
 # the kernel source to be in the correct packaged RHEL location.
@@ -29,6 +29,8 @@ chmod 755 kmodtool
 popd
 # Next we replace %kernel_module_package with one that is nearly
 # identical, but calls lbuild's modified kmodtool script.
+# We need to cleanout the previous entry
+sed -i "/^%kernel_module_package/,/^)}$/d" $RMAC
 sed -e "s|REPLACE_ME|$LBUILD_KMODTOOL|" \
     ${LBUILD_DIR}/rhel7/rpmmacros.template > ${LBUILD_DIR}/rhel7/rpmmacros
 cat ${LBUILD_DIR}/rhel7/rpmmacros >> $RMAC
@@ -102,3 +104,7 @@ kernel_srpm_location() {
     echo "http://vault.centos.org/centos/7/updates/Source/SPackages/"
 
 }
+
+cleanup_rpmmacros() {
+       sed -i "/^%kernel_module_package/,/^)}$/d" $RMAC
+}