[gdrcopy-kmod] fixup arch condition for now
by Nicolas Chauvet
commit 73dd7aa9954685f34ef64e426b4b32598189a293
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 17 20:01:19 2022 +0100
fixup arch condition for now
gdrcopy-kmod.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/gdrcopy-kmod.spec b/gdrcopy-kmod.spec
index 2051c42..f5d2df6 100644
--- a/gdrcopy-kmod.spec
+++ b/gdrcopy-kmod.spec
@@ -20,7 +20,11 @@ URL: https://github.com/NVIDIA/gdrcopy
Source0: %{url}/archive/v%{version}/gdrcopy-%{version}.tar.gz
# Should be supported on ppc64le, but no public driver yet
+%if 0%{?fedora}
ExclusiveArch: x86_64 aarch64
+%else
+ExclusiveArch: x86_64
+%endif
BuildRequires: gcc
BuildRequires: xorg-x11-drv-nvidia-kmodsrc
2 years, 1 month
[gdrcopy-kmod] Update to 2.3
by Nicolas Chauvet
commit eced8e8f5ba1b55d16f9383311010feb392df3e0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 17 18:05:18 2022 +0100
Update to 2.3
gdrcopy-kmod.spec | 13 ++++++++-----
sources | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gdrcopy-kmod.spec b/gdrcopy-kmod.spec
index 617729c..2051c42 100644
--- a/gdrcopy-kmod.spec
+++ b/gdrcopy-kmod.spec
@@ -1,8 +1,8 @@
-# Copyright (c) 2015-2021, Nicolas Chauvet <kwizart(a)gmail.com>
+# Copyright (c) 2015-2022, Nicolas Chauvet <kwizart(a)gmail.com>
# All rights reserved.
%{?!nvidia_kmodsrc_version:
-%global nvidia_kmodsrc_version 460.56
+%global nvidia_kmodsrc_version 515.65
}
%if 0%{?fedora}
@@ -11,8 +11,8 @@
%endif
Name: gdrcopy-kmod
-Version: 2.2
-Release: 2%{?dist}
+Version: 2.3
+Release: 1%{?dist}
Summary: A fast GPU memory copy library based on NVIDIA GPUDirect RDMA technology
License: MIT
@@ -20,7 +20,7 @@ URL: https://github.com/NVIDIA/gdrcopy
Source0: %{url}/archive/v%{version}/gdrcopy-%{version}.tar.gz
# Should be supported on ppc64le, but no public driver yet
-ExclusiveArch: x86_64
+ExclusiveArch: x86_64 aarch64
BuildRequires: gcc
BuildRequires: xorg-x11-drv-nvidia-kmodsrc
@@ -78,6 +78,9 @@ done
%changelog
+* Thu Nov 17 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-1
+- Update to 2.3
+
* Fri Mar 12 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2-2
- Rebuilt
diff --git a/sources b/sources
index 07ea610..8b9a2ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gdrcopy-2.2.tar.gz) = d6541591b21563f14b764c482b5826dbd4e45c8758b04dd3f717378f230d78a1f376114236fb6ab8285acca72b729441d436d1eb1b2214129407d856bf4d9f8e
+SHA512 (gdrcopy-2.3.tar.gz) = 3f437a301654bbf29fd5e746a9c7441efff33e06d5dadcd64736d3e6d22f2ce728fd84c88ee62503280ca313e05bc87df42af09e581ab3af3c571b1af037a353
2 years, 1 month
[xtables-addons-kmod/el9] Apply fixes for rhel
by Nicolas Chauvet
commit bb3a3f9988d17bbffd37917c9c23653f6a7ba84e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 17 19:25:36 2022 +0100
Apply fixes for rhel
xtables-addons-kmod.spec | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/xtables-addons-kmod.spec b/xtables-addons-kmod.spec
index 04fb07d..0083832 100644
--- a/xtables-addons-kmod.spec
+++ b/xtables-addons-kmod.spec
@@ -5,8 +5,8 @@
# a new akmod package will only get build when a new one is actually needed
%if 0%{?fedora}
%global buildforkernels akmod
-%global debug_package %{nil}
%endif
+%global debug_package %{nil}
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
@@ -15,7 +15,8 @@ Release: 1%{?dist}
License: GPLv2
URL: https://inai.de/projects/xtables-addons/
Source0: https://inai.de/files/xtables-addons/xtables-addons-%{version}.tar.xz
-Patch0: el8_fix.patch
+Patch0: Fixes-for-rhel8-kernel.patch
+Patch1: Fixes-for-rhel9-kernel.patch
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: gcc, elfutils-libelf-devel, buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -38,8 +39,14 @@ the xtables-addons package in order to make use of these modules.
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
-%autosetup -c -T -a 0 -p 0
-ls
+%setup -q -c -T -a 0
+pushd xtables-addons-%{version}
+%patch0 -p1
+%if 0%{?el9}
+%patch1 -p1
+%endif
+popd
+
for kernel_version in %{?kernel_versions} ; do
cp -a xtables-addons-%{version} _kmod_build_${kernel_version%%___*}
done
2 years, 1 month
[xtables-addons-kmod/el9] Add fixes
by Nicolas Chauvet
commit 49b5b67d13167d0fc46847039980ae233e17386e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 17 19:25:21 2022 +0100
Add fixes
Fixes-for-rhel8-kernel.patch | 40 ++++++++++++++++++++++++++++++++++++++++
Fixes-for-rhel9-kernel.patch | 26 ++++++++++++++++++++++++++
2 files changed, 66 insertions(+)
---
diff --git a/Fixes-for-rhel8-kernel.patch b/Fixes-for-rhel8-kernel.patch
new file mode 100644
index 0000000..fe6c3c6
--- /dev/null
+++ b/Fixes-for-rhel8-kernel.patch
@@ -0,0 +1,40 @@
+From 714af93e290134dd66ea7fec824a6637ef8ecd7e Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart(a)gmail.com>
+Date: Thu, 17 Nov 2022 18:37:25 +0100
+Subject: [PATCH] Fixes for rhel8 kernel
+
+Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com>
+---
+ extensions/compat_xtables.h | 2 +-
+ extensions/xt_ipp2p.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
+index 1feea880057d..0a362177e19b 100644
+--- a/extensions/compat_xtables.h
++++ b/extensions/compat_xtables.h
+@@ -21,7 +21,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) || \
+ LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 9) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) || \
+ LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 78) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) || \
+- LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 158) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
++ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
+ #else
+ # define ip_route_me_harder(xnet, xsk, xskb, xaddrtype) ip_route_me_harder((xnet), (xskb), (xaddrtype))
+ # define ip6_route_me_harder(xnet, xsk, xskb) ip6_route_me_harder((xnet), (xskb))
+diff --git a/extensions/xt_ipp2p.c b/extensions/xt_ipp2p.c
+index 2a9f3e4553b0..043f1b740493 100644
+--- a/extensions/xt_ipp2p.c
++++ b/extensions/xt_ipp2p.c
+@@ -19,7 +19,7 @@ MODULE_AUTHOR("Eicke Friedrich/Klaus Degner <ipp2p(a)ipp2p.org>");
+ MODULE_DESCRIPTION("An extension to iptables to identify P2P traffic.");
+ MODULE_LICENSE("GPL");
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
+ static inline unsigned int
+ ip_transport_len(const struct sk_buff *skb)
+ {
+--
+2.38.1
+
diff --git a/Fixes-for-rhel9-kernel.patch b/Fixes-for-rhel9-kernel.patch
new file mode 100644
index 0000000..acdd159
--- /dev/null
+++ b/Fixes-for-rhel9-kernel.patch
@@ -0,0 +1,26 @@
+From a4a57555c8e6ebf23283cdd9307728bf5c432bc8 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart(a)gmail.com>
+Date: Thu, 17 Nov 2022 18:46:06 +0100
+Subject: [PATCH] Fixes for rhel9 kernel
+
+Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com>
+---
+ extensions/compat_xtables.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
+index 0a362177e19b..1c32ff4e9836 100644
+--- a/extensions/compat_xtables.h
++++ b/extensions/compat_xtables.h
+@@ -26,7 +26,7 @@
+ # define ip_route_me_harder(xnet, xsk, xskb, xaddrtype) ip_route_me_harder((xnet), (xskb), (xaddrtype))
+ # define ip6_route_me_harder(xnet, xsk, xskb) ip6_route_me_harder((xnet), (xskb))
+ #endif
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) && !defined(RHEL_MAJOR)
+ # define pde_data(inode) PDE_DATA(inode)
+ #endif
+
+--
+2.38.1
+
2 years, 1 month
[v4l2loopback-kmod/el9] Fix aarch64 on rhel9
by Nicolas Chauvet
commit 671c396c28950f0573ee84c0eb468324b0c782ea
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 17 18:28:42 2022 +0100
Fix aarch64 on rhel9
v4l2loopback-kmod.spec | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/v4l2loopback-kmod.spec b/v4l2loopback-kmod.spec
index d97d5b7..471a5a6 100644
--- a/v4l2loopback-kmod.spec
+++ b/v4l2loopback-kmod.spec
@@ -1,6 +1,12 @@
%if 0%{?fedora}
%global buildforkernels akmod
%endif
+%if 0%{?el9}
+# kmod fails on rhel9 kernel with aarch64 - just build an akmod there
+%ifarch aarch64
+%global buildforkernels akmod
+%endif
+%endif
%global debug_package %{nil}
%global prjname v4l2loopback
2 years, 1 month
[v4l2loopback-kmod] debug_package fix
by Nicolas Chauvet
commit c0e351ab2d50d88b88f6c6f330bc6dfa47db1a81
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 17 18:15:30 2022 +0100
debug_package fix
v4l2loopback-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/v4l2loopback-kmod.spec b/v4l2loopback-kmod.spec
index 8aa8741..d97d5b7 100644
--- a/v4l2loopback-kmod.spec
+++ b/v4l2loopback-kmod.spec
@@ -1,7 +1,7 @@
%if 0%{?fedora}
%global buildforkernels akmod
-%global debug_package %{nil}
%endif
+%global debug_package %{nil}
%global prjname v4l2loopback
2 years, 1 month