From f0214a59bba6bd8bd88c79e9db5d54d1e0a370b5 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 3 Aug 2020 03:38:01 +0000 Subject: [PATCH 1/2] Fix rpm build for EL mainline kernels git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9104 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scst.spec.in b/scst.spec.in index 8527e2800..005495823 100644 --- a/scst.spec.in +++ b/scst.spec.in @@ -43,6 +43,10 @@ # CentOSPlus %define kernel_devel_rpm kernel-plus-devel %else +%if %([ %{kernel_rpm} = kernel-ml-core ]; echo $((1-$?))) +# RHEL/CentOS elrepo mainline +%define kernel_devel_rpm kernel-ml-devel +%else %if %([ %{kernel_rpm} = kernel-core ]; echo $((1-$?))) # Fedora %define kernel_devel_rpm kernel-devel @@ -51,6 +55,7 @@ %define kernel_devel_rpm %{kernel_rpm}-devel %endif %endif +%endif %{echo:kernel_devel_rpm=%{kernel_devel_rpm} } %endif From f397c9558c5d0b5cdb939adba64d426dc43a3995 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 3 Aug 2020 03:39:01 +0000 Subject: [PATCH 2/2] Fix scst-dkms-rpm build for EL mainline kernels git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9105 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst-dkms.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scst-dkms.spec.in b/scst-dkms.spec.in index af407f750..ccacdcbbb 100644 --- a/scst-dkms.spec.in +++ b/scst-dkms.spec.in @@ -38,6 +38,10 @@ # CentOSPlus %define kernel_devel_rpm kernel-plus-devel %else +%if %([ %{kernel_rpm} = kernel-ml-core ]; echo $((1-$?))) +# RHEL/CentOS elrepo mainline +%define kernel_devel_rpm kernel-ml-devel +%else %if %([ %{kernel_rpm} = kernel-core ]; echo $((1-$?))) # Fedora %define kernel_devel_rpm kernel-devel @@ -46,6 +50,7 @@ %define kernel_devel_rpm %{kernel_rpm}-devel %endif %endif +%endif %{echo:kernel_devel_rpm=%{kernel_devel_rpm} } %endif