From ea320e534bd5efd9ede577ed8e0e905c0b77ab7b Mon Sep 17 00:00:00 2001 From: Kmods SIG Date: Jan 13 2022 23:40:34 +0000 Subject: Switch to EL kernel source and versioning --- diff --git a/.gitignore b/.gitignore index 95a0598..8c696ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mvsas-4.18.tar.xz +SOURCES/mvsas-4.18.0-80.el8.tar.xz diff --git a/.kmod-mvsas.metadata b/.kmod-mvsas.metadata index a5e2ab9..7d9f02d 100644 --- a/.kmod-mvsas.metadata +++ b/.kmod-mvsas.metadata @@ -1 +1 @@ -ec8804836ef6162beb9eb8116692c75748166df6 SOURCES/mvsas-4.18.tar.xz +ba363c4dbaaf389202831fc2dd8c61bfbaeb4f1a SOURCES/mvsas-4.18.0-80.el8.tar.xz diff --git a/SOURCES/9999-enable-mvsas.patch b/SOURCES/9999-enable-mvsas.patch new file mode 100644 index 0000000..699cce9 --- /dev/null +++ b/SOURCES/9999-enable-mvsas.patch @@ -0,0 +1,7 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -27 +27 @@ +-obj-$(CONFIG_SCSI_MVSAS) += mvsas.o ++obj-m += mvsas.o +@@ -31,0 +32 @@ ++ccflags-y += -DCONFIG_SCSI_MVSAS_TASKLET diff --git a/SPECS/kmod-mvsas.spec b/SPECS/kmod-mvsas.spec index ee79644..9d685b8 100644 --- a/SPECS/kmod-mvsas.spec +++ b/SPECS/kmod-mvsas.spec @@ -1,5 +1,7 @@ %global pkg mvsas +%global driver_version 4.18.0-80.el8 + %global kernel_version 4.18.0-348.el8 %global _use_internal_dependency_generator 0 @@ -18,14 +20,15 @@ Name: kmod-%{pkg} -Version: 4.18 -Release: 6%{?dist} +Version: 4.18.0.80 +Release: 1%{?dist} Summary: Marvell 88SE64XX/88SE94XX SAS/SATA Controller (%{pkg}) driver License: GPLv2 URL: https://www.kernel.org/ -Source0: %{pkg}-%{version}.tar.xz +Source0: %{pkg}-%{driver_version}.tar.xz +Patch9999: 9999-enable-mvsas.patch ExclusiveArch: x86_64 aarch64 @@ -62,7 +65,7 @@ chip based PCI-E host adapters. %prep -%autosetup -p1 -n %{pkg}-%{version} +%autosetup -p1 -n %{pkg}-%{driver_version} %build @@ -127,8 +130,6 @@ fi %changelog -* Tue Nov 09 2021 Peter Georg - 4.18-6 -- Rebuild for 4.18.0-348.el8 - -* Tue Sep 28 2021 Peter Georg - 4.18-5 -- Convert to kABI tracking kmod package (kernel >= 4.18.0-305.7.1.el8_4) +* Wed Jan 12 2022 Kmods SIG - 4.18.0.80-1 +- Switch to EL kernel source and versioning +- kABI tracking kmod package (kernel >= 4.18.0-348.el8)