From 1989badcd5d21f04074e7b10e494498942f4f97e Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Wed, 12 Feb 2020 14:19:09 -0600 Subject: [PATCH] LU-13226 ldiskfs: Add support for Ubuntu eoan 5.3 Ubuntu eoan kernel is close enough to 5.4.7+ mainline to use the patch series directly. Update the configure script to select it. Test-Parameters: trivial Cray-bug-id: LUS-8485 Signed-off-by: Shaun Tancheff Change-Id: Iadb9b87a153a88846399d91699c972c72a5e1e7a Reviewed-on: https://review.whamcloud.com/37554 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Petros Koutoupis Reviewed-by: Oleg Drokin --- config/lustre-build-ldiskfs.m4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index 6693ea5..63b4e7b 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -60,6 +60,7 @@ AS_IF([test x$RHEL_KERNEL = xyes], [ )], [LDISKFS_SERIES="4.4-sles12sp3.series"], [LDISKFS_SERIES="4.4-sles12sp3.series"]) ], [test x$UBUNTU_KERNEL = xyes], [ + AS_VERSION_COMPARE([$LINUXRELEASE],[5.3.0],[ AS_VERSION_COMPARE([$LINUXRELEASE],[5.0.0],[ AS_VERSION_COMPARE([$LINUXRELEASE],[4.15.0],[ AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0], [], @@ -90,7 +91,9 @@ AS_IF([test x$RHEL_KERNEL = xyes], [ ], [LDISKFS_SERIES="4.15.0-24-ubuntu18.series"])], [LDISKFS_SERIES="5.0.0-13-ubuntu19.series"], - [LDISKFS_SERIES="5.0.0-13-ubuntu19.series"]) + [LDISKFS_SERIES="5.0.0-13-ubuntu19.series"])], + [LDISKFS_SERIES="5.4.0-ml.series"], + [LDISKFS_SERIES="5.4.0-ml.series"]) ]) ]) # Not RHEL/SLES or Ubuntu .. probably mainline -- 1.8.3.1