Whamcloud - gitweb
LU-18217 build: Ensure LINUX_RELEASE is defined 33/56333/3
authorShaun Tancheff <shaun.tancheff@hpe.com>
Wed, 11 Sep 2024 16:07:56 +0000 (23:07 +0700)
committerOleg Drokin <green@whamcloud.com>
Fri, 27 Sep 2024 23:55:59 +0000 (23:55 +0000)
Ensure LINUX_RELEASE is defined to something consumable by buildrpm

Ex:
  sh ./autogen.sh
  ./configure --enable-dist
  make srpm

Test-Parameters: trivial
Fixes: 0c46ba62efb ("LU-17850 build: prefer LINUXRELEASE over uname -r")
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I647a27729c4d14a3983edc74f19a420bb6968631
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56333
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
config/lustre-build.m4

index 3fd481b..fd62f31 100644 (file)
@@ -675,7 +675,9 @@ AS_IF([test "x$enable_tests" = xyes], [
 LIBCFS_CONFIG_CDEBUG
 LC_QUOTA
 
-AS_IF([test "x$enable_dist" != xno], [],[LB_LIBMOUNT])
+AS_IF([test "x$enable_dist" != xno], [
+       AS_IF([test -z $LINUXRELEASE], [LINUXRELEASE="%{nil}"])
+       AC_SUBST(LINUXRELEASE)],[LB_LIBMOUNT])
 LB_PATH_LUSTREIOKIT
 
 LB_DEFINE_E2FSPROGS_NAMES