From 7e07483e3a5cc803d223c57cc0e35b26c30a35c3 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Wed, 13 May 2020 18:57:57 -0500 Subject: [PATCH] LU-13555 build: Map mainline kernel on rhel to rhel Mainline kernel builds on RHEL can map to RHEL directly and the MAINLINE_KERNEL abstraction is not needed and can be removed. Test-Parameters: trivial HPE-bug-id: LUS-7689 Signed-off-by: Shaun Tancheff Change-Id: I80ba0477c405b9d0f12b4d472f244bb9b15999ff Reviewed-on: https://review.whamcloud.com/38594 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Petros Koutoupis Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- config/lustre-build-linux.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index b8a5c2e..9040a81 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -157,7 +157,7 @@ AC_DEFUN([LB_LINUX_RELEASE], [ ]) ]) AS_IF([test "x$lb_cv_mainline_kernel_sig" = "xyes"], [ - MAINLINE_KERNEL="yes" + RHEL_KERNEL="yes" KERNEL_FOUND="yes" ]) ]) @@ -174,7 +174,6 @@ AC_DEFUN([LB_LINUX_RELEASE], [ [KMP_MODDIR=$withval IN_KERNEL=''],[ AS_IF([test x$RHEL_KERNEL = xyes], [KMP_MODDIR="extra/kernel"], - [test x$MAINLINE_KERNEL = xyes], [KMP_MODDIR="extra/kernel"], [test x$SUSE_KERNEL = xyes], [KMP_MODDIR="updates/kernel"], [test x$UBUNTU_KERNEL = xyes], [KMP_MODDIR="updates/kernel"], [test x$DEBIAN_KERNEL = xyes], [KMP_MODDIR="updates/kernel"], -- 1.8.3.1