diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fca0337 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/be2iscsi-4.18.0-305.el8.tar.xz diff --git a/.kmod-be2iscsi.metadata b/.kmod-be2iscsi.metadata new file mode 100644 index 0000000..c05abc7 --- /dev/null +++ b/.kmod-be2iscsi.metadata @@ -0,0 +1 @@ +d23dee8b34302f6486c1035bbe089b99bf7ba327 SOURCES/be2iscsi-4.18.0-305.el8.tar.xz diff --git a/SOURCES/0001-add-deprecated-ids-be3.patch b/SOURCES/0001-add-deprecated-ids-be3.patch new file mode 100644 index 0000000..ce61e18 --- /dev/null +++ b/SOURCES/0001-add-deprecated-ids-be3.patch @@ -0,0 +1,11 @@ +--- a/src/be_main.c ++++ b/src/be_main.c +@@ -376,6 +376,8 @@ + + /*------------------- PCI Driver operations and data ----------------- */ + static const struct pci_device_id beiscsi_pci_id_table[] = { ++ { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) }, ++ { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) }, + { PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) }, + { 0 } + }; diff --git a/SOURCES/0002-add-deprecated-ids-be2.patch b/SOURCES/0002-add-deprecated-ids-be2.patch new file mode 100644 index 0000000..bca5a42 --- /dev/null +++ b/SOURCES/0002-add-deprecated-ids-be2.patch @@ -0,0 +1,14 @@ +--- a/src/be_main.c ++++ b/src/be_main.c +@@ -376,6 +376,9 @@ + + /*------------------- PCI Driver operations and data ----------------- */ + static const struct pci_device_id beiscsi_pci_id_table[] = { ++ { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) }, ++ { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) }, ++ { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) }, + { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) }, + { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) }, + { PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) }, + { 0 } + }; diff --git a/SPECS/kmod-be2iscsi.spec b/SPECS/kmod-be2iscsi.spec new file mode 100644 index 0000000..5b27d07 --- /dev/null +++ b/SPECS/kmod-be2iscsi.spec @@ -0,0 +1,181 @@ +%global pkg be2iscsi + +%global kernel_version_min 4.18.0-305.el8 + +# To pick a specific kernel use `--define "kernel_version 4.18.0-315.el8"` +# Otherwise the latest installed kernel-devel version later than +# %%{kernel_version_min} will be used. + +%global kernel_version_latest %({ echo %{kernel_version_min}; rpm --query kernel-devel --queryformat '%%{VERSION}-%%{RELEASE}\\\n' | grep -v "package kernel-devel is not installed"; } | sort -V | sed -e '0,/^%{kernel_version_min}$/d' | tail -n 1) + +%if "%{kernel_version_latest}" != "" +%{!?kernel_version:%{expand:%%global kernel_version %{kernel_version_latest}}} +%endif + +%global _use_internal_dependency_generator 0 +%global __find_requires %{nil} +%global __find_provides /usr/lib/rpm/find-provides + +%global debug_package %{nil} + +%global __spec_install_post \ + %{?__debug_package:%{__debug_install_post}} \ + %{__arch_install_post} \ + %{__os_install_post} \ + %{__mod_compress_install_post} + +%global __mod_compress_install_post find %{buildroot}/lib/modules -type f -name \*.ko -exec xz \{\} \\; + + +Name: kmod-%{pkg} +Version: 4.18.0 +Release: 305%{?dist} +Summary: Emulex OneConnectOpen-iSCSI (%{pkg}) driver + +License: GPLv2 +URL: https://www.kernel.org/ + +Source0: %{pkg}-%{kernel_version_min}.tar.xz +Patch1: 0001-add-deprecated-ids-be3.patch +Patch2: 0002-add-deprecated-ids-be2.patch + +ExclusiveArch: x86_64 aarch64 + +BuildRequires: elfutils-libelf-devel +BuildRequires: gcc +BuildRequires: kmod +BuildRequires: make +BuildRequires: redhat-rpm-config +BuildRequires: xz + +%{!?kernel_version: +BuildRequires: kernel-devel >= %{kernel_version_min} +} + +%{?kernel_version: +BuildRequires: kernel-devel = %{kernel_version} +BuildRequires: kernel-devel-uname-r = %{kernel_version}.%{_arch} + +Requires: kernel-core = %{kernel_version} +Requires: kernel-core-uname-r = %{kernel_version}.%{_arch} +Requires: kernel-modules = %{kernel_version} +Requires: kernel-modules-uname-r = %{kernel_version}.%{_arch} + +Provides: installonlypkg(kernel-module) +Provides: %{name}-%{kernel_version}.%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} +} + +Requires(post): /usr/sbin/depmod +Requires(postun): /usr/sbin/depmod + +Requires(post): /usr/bin/dracut +Requires(postun): /usr/bin/dracut + + +%description +This package provides the Emulex OneConnectOpen-iSCSI (%{pkg}) driver. Compared +to the in-kernel driver this driver re-enables support for deprecated +BladeEngine 2 and 3 adapters. + +BladeEngine 2 (BE2) devices: +- 0x19A2:0x0212: Emulex BladeEngine 2 10Gb iSCSI Initiator +- 0x19A2:0x0702: Emulex OneConnect OCe10101/OCm10101/OCe10102/OCm10102 +- 0x19A2:0x0703: Emulex OneConnect OCe10100 + +BladeEngine 3 (BE3) devices: +- 0x19A2:0x0222: Emulex BladeEngine 3 iSCSI +- 0x19A2:0x0712: Emulex OneConnect Tomcat iSCSI + + +%prep +%autosetup -p1 -n %{pkg}-%{kernel_version_min} + + +%build +pushd src +%{__make} -C /usr/src/kernels/%{kernel_version}.%{_arch} %{?_smp_mflags} M=$PWD modules +popd + + +%install +%{__install} -D -t %{buildroot}/lib/modules/%{kernel_version}.%{_arch}/extra/drivers/scsi/%{pkg} src/%{pkg}.ko + +# Make .ko objects temporarily executable for automatic stripping +find %{buildroot}/lib/modules -type f -name \*.ko -exec chmod u+x \{\} \+ + + +%clean +%{__rm} -rf %{buildroot} + + +%post +mkdir -p %{_localstatedir}/lib/rpm-state/sig-kmods +touch %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch} + + +%preun +mkdir -p %{_localstatedir}/lib/rpm-state/sig-kmods +touch %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch} + + +%postun +if [ -f %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch} ] +then + if [ -f /lib/modules/%{kernel_version}.%{_arch}/System.map ] + then + /usr/sbin/depmod -aeF /lib/modules/%{kernel_version}.%{_arch}/System.map %{kernel_version}.%{_arch} + fi + + if [ -f /boot/initramfs-%{kernel_version}.%{_arch}.img ] + then + if /usr/bin/dracut -f --rebuild /boot/initramfs-%{kernel_version}.%{_arch}.img /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew %{kernel_version}.%{_arch} + then + if ! cmp -s /boot/initramfs-%{kernel_version}.%{_arch}.img /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew + then + mv /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew /boot/initramfs-%{kernel_version}.%{_arch}.img + else + rm -f /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew + fi + fi + fi + + rm -f %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch} + rmdir --ignore-fail-on-non-empty %{_localstatedir}/lib/rpm-state/sig-kmods +fi + + +%posttrans +if [ -f %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch} ] +then + if [ -f /lib/modules/%{kernel_version}.%{_arch}/System.map ] + then + /usr/sbin/depmod -aeF /lib/modules/%{kernel_version}.%{_arch}/System.map %{kernel_version}.%{_arch} + fi + + if [ -f /boot/initramfs-%{kernel_version}.%{_arch}.img ] + then + if /usr/bin/dracut -f --rebuild /boot/initramfs-%{kernel_version}.%{_arch}.img /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew %{kernel_version}.%{_arch} + then + if ! cmp -s /boot/initramfs-%{kernel_version}.%{_arch}.img /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew + then + mv /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew /boot/initramfs-%{kernel_version}.%{_arch}.img + else + rm -f /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew + fi + fi + fi + + rm -f %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch} + rmdir --ignore-fail-on-non-empty %{_localstatedir}/lib/rpm-state/sig-kmods +fi + + +%files +%defattr(644,root,root,755) +/lib/modules/%{kernel_version}.%{_arch} +%license COPYING + + +%changelog +* Wed Aug 11 2021 Peter Georg - 4.18.0-305 +- Initial version