[packages/wl] - build fix for kernel 6.12, rel 20

baggins baggins at pld-linux.org
Thu Nov 28 11:06:54 CET 2024


commit 6bfc04948ab15f190b5a0221e904d24ab7b953df
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Nov 28 10:00:49 2024 +0100

    - build fix for kernel 6.12, rel 20

 kernel-6.12.patch | 14 ++++++++++++++
 wl.spec           |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/wl.spec b/wl.spec
index e31f144..82b9c8b 100644
--- a/wl.spec
+++ b/wl.spec
@@ -18,7 +18,7 @@ exit 1
 
 %define		_duplicate_files_terminate_build	0
 
-%define		rel	19
+%define		rel	20
 %define		pname	wl
 %define		file_ver	%(echo %{version} | tr . _)
 Summary:	Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
@@ -51,6 +51,7 @@ Patch12:	kernel-5.17.patch
 Patch13:	kernel-5.18.patch
 Patch14:	kernel-6.0.patch
 Patch15:	kernel-6.1.patch
+Patch16:	kernel-6.12.patch
 URL:		http://www.broadcom.com/support/802.11
 BuildRequires:	rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -145,6 +146,7 @@ EOF\
 %patch13 -p2
 %patch14 -p2
 %patch15 -p2
+%patch16 -p2
 
 mkdir wl
 mv lib src Makefile wl/
diff --git a/kernel-6.12.patch b/kernel-6.12.patch
new file mode 100644
index 0000000..abf1d48
--- /dev/null
+++ b/kernel-6.12.patch
@@ -0,0 +1,14 @@
+--- wl-6.30.223.271/wl/src/wl/sys/wl_linux.c~	2024-11-28 09:55:50.000000000 +0100
++++ wl-6.30.223.271/wl/src/wl/sys/wl_linux.c	2024-11-28 09:59:08.975905609 +0100
+@@ -56,7 +56,11 @@
+ #include <asm/irq.h>
+ #include <asm/pgtable.h>
+ #include <asm/uaccess.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
+ #include <asm/unaligned.h>
++#else
++#include <linux/unaligned.h>
++#endif
+ 
+ #include <proto/802.1d.h>
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wl.git/commitdiff/6bfc04948ab15f190b5a0221e904d24ab7b953df



More information about the pld-cvs-commit mailing list