From 6eb5d3ae4aaab1662afc8ae50f56b0a0eaa6556a Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Mon, 29 Nov 2021 15:32:17 -0800 Subject: [PATCH] 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 Reviewed-on: https://review.whamcloud.com/45677 Tested-by: jenkins Reviewed-by: Patrick Farrell Reviewed-by: Jian Yu Tested-by: Maloo Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 2 +- contrib/lbuild/lbuild-rhel | 2 +- contrib/lbuild/lbuild-rhel7 | 2 +- contrib/lbuild/lbuild-rhel8 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 -- 1.8.3.1