diff --git a/.gitignore b/.gitignore index 5ec67ac..7015a01 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/isci-5.0.tar.xz +SOURCES/isci-4.18.0-257.el8.tar.xz diff --git a/.kmod-isci.metadata b/.kmod-isci.metadata index 4db3ce7..3964505 100644 --- a/.kmod-isci.metadata +++ b/.kmod-isci.metadata @@ -1 +1 @@ -91d6f4dd18a0f1d51b18b42424c797511c1ceea2 SOURCES/isci-5.0.tar.xz +e4db60327a4593db8c4d1df0035a953183d588d2 SOURCES/isci-4.18.0-257.el8.tar.xz diff --git a/SOURCES/9999-enable-isci.patch b/SOURCES/9999-enable-isci.patch new file mode 100644 index 0000000..1b2845a --- /dev/null +++ b/SOURCES/9999-enable-isci.patch @@ -0,0 +1,5 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -2 +2 @@ +-obj-$(CONFIG_SCSI_ISCI) += isci.o ++obj-m += isci.o diff --git a/SPECS/kmod-isci.spec b/SPECS/kmod-isci.spec index 759572d..815765b 100644 --- a/SPECS/kmod-isci.spec +++ b/SPECS/kmod-isci.spec @@ -1,6 +1,8 @@ %global pkg isci -%global kernel_version 4.18.0-358.el8 +%global driver_version 4.18.0-257.el8 + +%global kernel_version 4.18.0-348.el8 %global _use_internal_dependency_generator 0 %global __find_requires /usr/lib/rpm/redhat/find-requires @@ -18,14 +20,15 @@ Name: kmod-%{pkg} -Version: 5.0 -Release: 6%{?dist} +Version: 4.18.0.257 +Release: 1%{?dist} Summary: Intel(R) C600 Series Chipset SAS Controller (%{pkg}) driver License: GPLv2 and (BSD or GPLv2) URL: https://www.kernel.org/ -Source0: %{pkg}-%{version}.tar.xz +Source0: %{pkg}-%{driver_version}.tar.xz +Patch9999: 9999-enable-isci.patch ExclusiveArch: x86_64 @@ -75,7 +78,7 @@ found in the Intel(R) C600 series chipset. Supported devices: %prep -%autosetup -p1 -n %{pkg}-%{version} +%autosetup -p1 -n %{pkg}-%{driver_version} %build @@ -140,8 +143,6 @@ fi %changelog -* Mon Jan 10 2022 Kmods SIG - 5.0-6 -- Rebuild for 4.18.0-358.el8 - -* Tue Sep 28 2021 Peter Georg - 5.0-5 -- Convert to kABI tracking kmod package (kernel >= 4.18.0-315.el8) +* Wed Jan 12 2022 Kmods SIG - 4.18.0.257-1 +- Switch to EL kernel source and versioning +- kABI tracking kmod package (kernel >= 4.18.0-348.el8)