Whamcloud - gitweb
LU-18338 build: fix Ubuntu kernel signature check 13/56613/2
authorJian Yu <yujian@whamcloud.com>
Tue, 8 Oct 2024 19:42:49 +0000 (12:42 -0700)
committerOleg Drokin <green@whamcloud.com>
Sun, 24 Nov 2024 06:07:20 +0000 (06:07 +0000)
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 <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56613
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
config/lustre-build-linux.m4

index ce8c99a..e0a7ba5 100644 (file)
@@ -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"
                        ])
                ])