[packages/dahdi-linux] - build fix for kernel 5.17, rel 8
baggins
baggins at pld-linux.org
Sat Apr 2 23:10:15 CEST 2022
commit 1ccd2f24e3066ca5139cd53a9dbbac8d9183475d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Apr 2 23:09:57 2022 +0200
- build fix for kernel 5.17, rel 8
dahdi-linux.spec | 4 +++-
kernel-5.17.patch | 13 +++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 911b53e..47b9261 100644
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -33,7 +33,7 @@ exit 1
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
-%define rel 7
+%define rel 8
%define pname dahdi-linux
%define FIRMWARE_URL http://downloads.digium.com/pub/telephony/firmware/releases
Summary: DAHDI telephony device support
@@ -62,6 +62,7 @@ Patch3: kernel-5.6.patch
Patch4: kernel-5.9.patch
Patch5: kernel-4.9.256.patch
Patch6: nostdinc.patch
+Patch7: kernel-5.17.patch
URL: http://www.asterisk.org/
%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
BuildRequires: perl-base
@@ -168,6 +169,7 @@ cd ../..\
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
ln -s $a drivers/dahdi/firmware
diff --git a/kernel-5.17.patch b/kernel-5.17.patch
new file mode 100644
index 0000000..aa359ee
--- /dev/null
+++ b/kernel-5.17.patch
@@ -0,0 +1,13 @@
+--- dahdi-linux-3.1.0/include/dahdi/kernel.h~ 2022-04-02 22:49:13.000000000 +0200
++++ dahdi-linux-3.1.0/include/dahdi/kernel.h 2022-04-02 23:08:10.095243044 +0200
+@@ -1504,6 +1504,10 @@
+
+ #endif /* 4.15.0 */
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)
++#define PDE_DATA pde_data
++#endif
++
+ #ifndef dahdi_ktime_equal
+ static inline int dahdi_ktime_equal(const ktime_t cmp1, const ktime_t cmp2)
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dahdi-linux.git/commitdiff/1ccd2f24e3066ca5139cd53a9dbbac8d9183475d
More information about the pld-cvs-commit
mailing list