Merge pull request #28 from dodexahedron/master

Fix RPM builds on EL mainline kernels
This commit is contained in:
Bart Van Assche
2020-08-02 20:36:11 -07:00
committed by GitHub
2 changed files with 10 additions and 0 deletions

View File

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

View File

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