diff options
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r14.ebuild (renamed from sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r13.ebuild) | 1 | ||||
| -rw-r--r-- | sys-kernel/bcmwl-dkms/files/dkms.conf | 2 | ||||
| -rw-r--r-- | sys-kernel/bcmwl-dkms/files/kernel-6.12.patch | 32 |
3 files changed, 34 insertions, 1 deletions
diff --git a/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r13.ebuild b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r14.ebuild index 6dcd3345..df7ce0d3 100644 --- a/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r13.ebuild +++ b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r14.ebuild @@ -29,6 +29,7 @@ PATCHES=( "${FILESDIR}"/kernel-5.18.patch "${FILESDIR}"/kernel-6.0.patch "${FILESDIR}"/kernel-6.1.patch + "${FILESDIR}"/kernel-6.12.patch ) S="${WORKDIR}" diff --git a/sys-kernel/bcmwl-dkms/files/dkms.conf b/sys-kernel/bcmwl-dkms/files/dkms.conf index 9c2b7b6c..14e9aa9f 100644 --- a/sys-kernel/bcmwl-dkms/files/dkms.conf +++ b/sys-kernel/bcmwl-dkms/files/dkms.conf @@ -1,6 +1,6 @@ PACKAGE_NAME="bcmwl-dkms" PACKAGE_VERSION="6.30.223.271" -BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-9]\.|\.|6\.1[0-1]\.)" # only build for kernels v5.x.x up to and including v6.11.x +BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-9]\.|\.|6\.1[0-2]\.)" # only build for kernels v5.x.x up to and including v6.12.x MAKE[0]="make KVER=$kernelver" MAKE[0]="make KV_FULL=$kernelver" BUILT_MODULE_NAME[0]="wl" diff --git a/sys-kernel/bcmwl-dkms/files/kernel-6.12.patch b/sys-kernel/bcmwl-dkms/files/kernel-6.12.patch new file mode 100644 index 00000000..1064225c --- /dev/null +++ b/sys-kernel/bcmwl-dkms/files/kernel-6.12.patch @@ -0,0 +1,32 @@ +From 5f6c5c8b27da17c80ce9bd2d6d714295bd352df5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= <nicolas.vieville@uphf.fr> +Date: Tue, 10 Dec 2024 09:22:46 +0100 +Subject: [PATCH] wl_linux.c: #include <linux/unaligned.h> for kernel >= 6.12.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Nicolas Viéville <nicolas.vieville@uphf.fr> +--- + src/wl/sys/wl_linux.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 2000f6f..3c25ce4 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -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> + +-- +2.47.1 + |