[packages/dahdi-linux] - const kernel 6.11, rel 2

[baggins]

commit 8aee039b24ff738bfb13b0b4c9851ea55b193eaf
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 29 23:39:19 2024 +0100

    - const kernel 6.11, rel 2

 dahdi-linux.spec  |  4 +++-
 kernel-6.11.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
---
diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 5c01d3a..829b39c 100644
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -25,7 +25,7 @@ exit 1
 # nothing to be placed to debuginfo package
 %define		_enable_debug_packages	0
 
-%define		rel	1
+%define		rel	2
 %define		pname	dahdi-linux
 %define		FIRMWARE_URL http://downloads.digium.com/pub/telephony/firmware/releases
 Summary:	DAHDI telephony device support
@@ -47,6 +47,7 @@ Source6:	%{FIRMWARE_URL}/dahdi-fw-tc400m-MR6.12.tar.gz
 # Source6-md5:	2ea860bb8a9d8ede2858b9557b74ee3c
 Source7:	%{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
 # Source7-md5:	a7f3886942bb3e9fed349a41b3390c9f
+Patch0:		kernel-6.11.patch
 Patch3:		no-xpp.patch
 URL:		http://www.asterisk.org/
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -145,6 +146,7 @@ cd ../..\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 %if %{without xpp}
 %patch3 -p1
 %endif
diff --git a/kernel-6.11.patch b/kernel-6.11.patch
new file mode 100644
index 0000000..5d4487a
--- /dev/null
+++ b/kernel-6.11.patch
@@ -0,0 +1,54 @@
+--- dahdi-linux-3.4.0/drivers/dahdi/dahdi-sysfs.c~	2024-04-17 09:01:20.000000000 +0200
++++ dahdi-linux-3.4.0/drivers/dahdi/dahdi-sysfs.c	2024-10-29 23:33:14.316364556 +0100
+@@ -42,7 +42,11 @@
+ MODULE_PARM_DESC(tools_rootdir,
+ 		"root directory of all tools paths (default /)");
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
+ static int span_match(struct device *dev, struct device_driver *driver)
++#else
++static int span_match(struct device *dev, const struct device_driver *driver)
++#endif
+ {
+ 	return 1;
+ }
+--- dahdi-linux-3.4.0/drivers/dahdi/dahdi-sysfs-chan.c~	2024-04-17 09:01:20.000000000 +0200
++++ dahdi-linux-3.4.0/drivers/dahdi/dahdi-sysfs-chan.c	2024-10-29 23:34:49.287998458 +0100
+@@ -220,7 +220,11 @@
+ 	chan_dbg(DEVICES, chan, "SYSFS\n");
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
+ static int chan_match(struct device *dev, struct device_driver *driver)
++#else
++static int chan_match(struct device *dev, const struct device_driver *driver)
++#endif
+ {
+ 	struct dahdi_chan *chan;
+ 
+--- dahdi-linux-3.4.0/drivers/dahdi/xpp/xbus-sysfs.c~	2024-04-17 09:01:21.000000000 +0200
++++ dahdi-linux-3.4.0/drivers/dahdi/xpp/xbus-sysfs.c	2024-10-29 23:37:24.788087673 +0100
+@@ -397,7 +397,11 @@
+ ATTRIBUTE_GROUPS(xbus_dev);
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
+ static int astribank_match(struct device *dev, struct device_driver *driver)
++#else
++static int astribank_match(struct device *dev, const struct device_driver *driver)
++#endif
+ {
+ 	DBG(DEVICES, "SYSFS MATCH: dev->bus_id = %s, driver->name = %s\n",
+ 	    dev_name(dev), driver->name);
+@@ -766,7 +770,11 @@
+ 	return len;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
+ static int xpd_match(struct device *dev, struct device_driver *driver)
++#else
++static int xpd_match(struct device *dev, const struct device_driver *driver)
++#endif
+ {
+ 	struct xpd_driver *xpd_driver;
+ 	xpd_t *xpd;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dahdi-linux.git/commitdiff/8aee039b24ff738bfb13b0b4c9851ea55b193eaf