From: Minh Diep <mdiep@whamcloud.com>
Date: Mon, 29 Nov 2021 23:32:17 +0000 (-0800)
Subject: LU-15286 build: only use baseonly option on el7
X-Git-Tag: 2.15.0-RC1~30
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F45677%2F9;p=fs%2Flustre-release.git

LU-15286 build: only use baseonly option on el7

el7 baseonly option allow to build perf package while
in el8 does not.

Test-Parameters: trivial

Change-Id: Ie973c5cc816b4b98ef71ab7080bd11286bcd644a
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/45677
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 86483d7..303d332 100755
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -29,7 +29,7 @@ push_exit_trap "kill -INT -$$ || true" kill_children
 
 # increment this if you have made a change that should force a new kernel
 # to build built
-BUILD_GEN=9
+BUILD_GEN=10
 
 TOPDIR="$PWD"
 
diff --git a/contrib/lbuild/lbuild-rhel b/contrib/lbuild/lbuild-rhel
index d8955f31..b5058c4 100644
--- a/contrib/lbuild/lbuild-rhel
+++ b/contrib/lbuild/lbuild-rhel
@@ -94,7 +94,7 @@ prepare_and_build_srpm() {
     rpmbuildopt="$rpmbuildopt $(get_rpmbuildopts)"
 
 	# now build it
-	if ! eval rpmbuild $rpmbuildopt --target ${TARGET_ARCH} --with baseonly \
+	if ! eval rpmbuild $rpmbuildopt --target ${TARGET_ARCH} \
 		--define \"_topdir $TOPDIR\" \
 		${buildid:+--define \"buildid $buildid\"} \
 		--define \"_tmppath $TMPDIR\" \
diff --git a/contrib/lbuild/lbuild-rhel7 b/contrib/lbuild/lbuild-rhel7
index 8226945..b424d3a 100644
--- a/contrib/lbuild/lbuild-rhel7
+++ b/contrib/lbuild/lbuild-rhel7
@@ -88,7 +88,7 @@ get_rpmbuildopts() {
     if $KERNEL_LUSTRE_NAMING; then
         echo -e "--define \"variant -lustre\" \c"
     fi
-    echo "--with firmware"
+    echo "--with firmware --with baseonly"
 
     return 0
 
diff --git a/contrib/lbuild/lbuild-rhel8 b/contrib/lbuild/lbuild-rhel8
index d0fa503..beeb6f2 100644
--- a/contrib/lbuild/lbuild-rhel8
+++ b/contrib/lbuild/lbuild-rhel8
@@ -93,7 +93,7 @@ get_rpmbuildopts() {
     if $KERNEL_LUSTRE_NAMING; then
         echo -e "--define \"variant -lustre\" \c"
     fi
-    echo "--with firmware"
+    echo "--with firmware --without debug"
 
     return 0