From 0124776ff3be79b68ebac9bd4488094356a037eb Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Fri, 6 May 2022 10:14:19 -0700 Subject: [PATCH] Revert "LU-12019 build: Recognize Debian Kernel and set KMP dir" This reverts commit 230d4500d5a9dfada392199d77fc413382f24750. Revert this commit because lustre failed to load on MOFED 5.5 See LU-15831 for details Change-Id: I845431ad2126743c1ca9a59d1b56e1a35dbc9e38 Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/47238 Tested-by: jenkins Reviewed-by: Oleg Drokin Tested-by: Oleg Drokin --- config/lustre-build-linux.m4 | 20 ++------------------ debian/postinst | 2 +- debian/rules | 2 +- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index fbf587e..e8122fe 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -97,7 +97,6 @@ AC_DEFUN([LB_LINUX_RELEASE], [ RHEL_KERNEL="no" SUSE_KERNEL="no" UBUNTU_KERNEL="no" - DEBIAN_KERNEL="no" # And if any of the above kernels has been detected yet KERNEL_FOUND="no" @@ -139,20 +138,6 @@ AC_DEFUN([LB_LINUX_RELEASE], [ ]) ]) - # Check for Debian - AS_IF([test "x$KERNEL_FOUND" = "xno"], [ - AC_CACHE_CHECK([for Debian kernel signature], lb_cv_debian_kernel_sig, [ - lb_cv_debian_kernel_sig="no" - AS_IF([grep -q "LINUX_PACKAGE_ID\s*\"\s*Debian" $LINUX_OBJ/include/generated/package.h], [ - lb_cv_debian_kernel_sig="yes" - ]) - ]) - AS_IF([test "x$lb_cv_debian_kernel_sig" = "xyes"], [ - DEBIAN_KERNEL="yes" - KERNEL_FOUND="yes" - ]) - ]) - # Check for a ELRepo -ml kernel on RHEL 7/8 AS_IF([test "x$KERNEL_FOUND" = "xno"], [ AC_CACHE_CHECK([for ELRepo -ml kernel signature on CentOS], @@ -173,7 +158,7 @@ AC_DEFUN([LB_LINUX_RELEASE], [ # If still no kernel was found, a warning is issued AS_IF([test "x$KERNEL_FOUND" = "xno"], [ - AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE, Ubuntu nor Debian]) + AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE nor Ubuntu]) ]) AC_MSG_CHECKING([for Linux kernel module package directory]) @@ -185,8 +170,7 @@ AC_DEFUN([LB_LINUX_RELEASE], [ AS_IF([test x$RHEL_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"], - [AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE, Ubuntu nor Debian])] + [AC_MSG_WARN([Kernel Distro seems to be neither RedHat, SuSE nor Ubuntu])] ) IN_KERNEL="${PACKAGE}"]) AC_MSG_RESULT($KMP_MODDIR) diff --git a/debian/postinst b/debian/postinst index 4b623f6..a05e2a5 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,6 +4,6 @@ DEPMOD_DIR="/etc/depmod.d" LUSTRE_DEPMOD_FILE="${DEPMOD_DIR}/lustre.conf" [ ! -d ${DEPMOD_DIR} ] && { mkdir -p ${DEPMOD_DIR}; } -[ ! -e ${LUSTRE_DEPMOD_FILE} ] && { echo "search updates/kernel built-in" > ${LUSTRE_DEPMOD_FILE}; } +[ ! -e ${LUSTRE_DEPMOD_FILE} ] && { echo "search updates built-in" > ${LUSTRE_DEPMOD_FILE}; } depmod -a diff --git a/debian/rules b/debian/rules index 30e8016..df80c07 100755 --- a/debian/rules +++ b/debian/rules @@ -509,7 +509,7 @@ kdist_config: prep-deb-files patch-stamp --disable-snmp \ --disable-tests \ --enable-quota \ - --with-kmp-moddir=updates/kernel \ + --with-kmp-moddir=updates \ $${EXTRAFLAGS} \ $(EXTRA_OPTIONS) -- 1.8.3.1