From 3a39e5a124db8de0b5badb47bd9ddc29d345b908 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 23 Nov 2021 04:28:40 +0000
Subject: [PATCH] fcst: Support both UEK 7 and UEK 8

r9586+r9587 added support for UEK 8 but broke support for UEK 7. Since as
far as I know no compile-time constants are available in UEK that allow to
tell the difference between the UEK 7 and UEK 8 5.4.17 kernels, extract the
UEK release number from the name of the directory with the kernel build
infrastructure.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9601 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 fcst/Kbuild   | 2 +-
 fcst/ft_cmd.c | 3 +--
 fcst/ft_io.c  | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fcst/Kbuild b/fcst/Kbuild
index 1954f60a5..1762fa4a0 100644
--- a/fcst/Kbuild
+++ b/fcst/Kbuild
@@ -1,5 +1,5 @@
 KBUILD_EXTRA_SYMBOLS=$(src)/../scst/src/Module.symvers
-ccflags-y += -I$(src)/../scst/include
+ccflags-y += -I$(src)/../scst/include $(shell ev=$$(basename $$(pwd)); echo "ev=$$ev" >&2; [ "$${ev/uek}" != "$${ev}" ] && ev=$${ev/*.el/} && echo -DUEK_RELEASE=$${ev/uek.*})
 
 obj-$(CONFIG_FCST) += fcst.o
 
diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c
index 8617352b3..2955165e4 100644
--- a/fcst/ft_cmd.c
+++ b/fcst/ft_cmd.c
@@ -20,8 +20,7 @@
 #include <linux/types.h>
 #include <scsi/libfc.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) &&		\
-	!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 17) &&	\
-	  defined(UEK_KABI_RENAME))
+	(!defined(UEK_RELEASE) || UEK_RELEASE -0 < 8)
 #include <scsi/fc_encode.h>
 #else
 #include <scsi/fc/fc_ms.h>
diff --git a/fcst/ft_io.c b/fcst/ft_io.c
index f540485a8..cabce0937 100644
--- a/fcst/ft_io.c
+++ b/fcst/ft_io.c
@@ -25,8 +25,7 @@
 #include <linux/types.h>
 #include <scsi/libfc.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) &&		\
-	!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 17) &&	\
-	  defined(UEK_KABI_RENAME))
+	(!defined(UEK_RELEASE) || UEK_RELEASE -0 < 8)
 #include <scsi/fc_encode.h>
 #else
 #include <scsi/fc/fc_ms.h>