mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-24 06:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fcst: Support both UEK 7 and UEK 8

Browse Source 
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
This commit is contained in:
Bart Van Assche
2021-11-23 04:28:40 +00:00
parent 6b8b4a8004
commit 3a39e5a124
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fcst/Kbuild
View File

@@ -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

3
fcst/ft_cmd.c
View File

@@ -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>

3
fcst/ft_io.c
View File

@@ -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>