From 27fa25b06b0613fb38323904a6e74624eb4a6640 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 8 Oct 2024 12:42:49 -0700 Subject: [PATCH] LU-18338 build: fix Ubuntu kernel signature check The Ubuntu kernel signature was checked by searching for CONFIG_VERSION_SIGNATURE from autoconf.h. However, in Ubuntu kernel 6.11.0-061100-generic, CONFIG_VERSION_SIGNATURE is not defined. We can search for UTS_UBUNTU_RELEASE_ABI from utsrelease.h. Test-Parameters: trivial mdtcount=4 mdscount=2 \ clientdistro=ubuntu2404 testlist=sanity Test-Parameters: trivial mdtcount=4 mdscount=2 \ env=SANITY_EXCEPT="255c" \ clientdistro=ubuntu2204 testlist=sanity Change-Id: I62e74ef936bbbf4e85130965cfff35aa7aa3be5e Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56613 Reviewed-by: James Simmons Reviewed-by: Shaun Tancheff Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- config/lustre-build-linux.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index ce8c99a..e0a7ba5 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -145,7 +145,7 @@ AC_DEFUN([LB_LINUX_RELEASE], [ AS_IF([test "x$KERNEL_FOUND" = "xno"], [ AC_CACHE_CHECK([for Ubuntu kernel signature], lb_cv_ubuntu_kernel_sig, [ lb_cv_ubuntu_kernel_sig="no" - AS_IF([fgrep -q "CONFIG_VERSION_SIGNATURE \"Ubuntu" $LINUX_OBJ/include/generated/autoconf.h], [ + AS_IF([fgrep -q "UTS_UBUNTU_RELEASE_ABI" $LINUX_OBJ/include/generated/utsrelease.h], [ lb_cv_ubuntu_kernel_sig="yes" ]) ]) -- 1.8.3.1