From e8dd044177397a0bb9aed9f27e53fa95aaf1fe36 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Dec 2024 20:50:13 +0000 Subject: sys-kernel/bcmwl-dkms : enable build for kernel v6.12.x --- .../sys-kernel/bcmwl-dkms-6.30.223.271-r13 | 12 ----- .../sys-kernel/bcmwl-dkms-6.30.223.271-r14 | 12 +++++ metadata/pkg_desc_index | 2 +- .../bcmwl-dkms/bcmwl-dkms-6.30.223.271-r13.ebuild | 56 --------------------- .../bcmwl-dkms/bcmwl-dkms-6.30.223.271-r14.ebuild | 57 ++++++++++++++++++++++ sys-kernel/bcmwl-dkms/files/dkms.conf | 2 +- sys-kernel/bcmwl-dkms/files/kernel-6.12.patch | 32 ++++++++++++ 7 files changed, 103 insertions(+), 70 deletions(-) delete mode 100644 metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r13 create mode 100644 metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r14 delete mode 100644 sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r13.ebuild create mode 100644 sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r14.ebuild create mode 100644 sys-kernel/bcmwl-dkms/files/kernel-6.12.patch diff --git a/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r13 b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r13 deleted file mode 100644 index 1ab11014..00000000 --- a/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r13 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst prerm -DEPEND=sys-kernel/dkms -DESCRIPTION=Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source -EAPI=8 -HOMEPAGE=http://www.broadcom.com/support/802.11/ -KEYWORDS=amd64 -LICENSE=Broadcom -RDEPEND=sys-kernel/dkms -RESTRICT=mirror -SLOT=0 -SRC_URI=x86? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz ) amd64? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt -> README-bcmwl-dkms-6.30.223.271.txt -_md5_=1b8b3744405185325477c39fff553b88 diff --git a/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r14 b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r14 new file mode 100644 index 00000000..c86aeff6 --- /dev/null +++ b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r14 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst prerm +DEPEND=sys-kernel/dkms +DESCRIPTION=Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source +EAPI=8 +HOMEPAGE=http://www.broadcom.com/support/802.11/ +KEYWORDS=amd64 +LICENSE=Broadcom +RDEPEND=sys-kernel/dkms +RESTRICT=mirror +SLOT=0 +SRC_URI=x86? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz ) amd64? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt -> README-bcmwl-dkms-6.30.223.271.txt +_md5_=1c113a4c121c44252f5384aa1c610324 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index d4916741..cc6a2a20 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -64,7 +64,7 @@ sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go sys-fs/vhba 20240917: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sys-fs/zfs 2.2.7: ZFS meta-package (Gentoo compatibility ebuild) sys-fs/zfs-utils 2.2.7: Userland utilities for ZFS Linux kernel module -sys-kernel/bcmwl-dkms 6.30.223.271-r13: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source +sys-kernel/bcmwl-dkms 6.30.223.271-r14: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source sys-kernel/dkms 2.3-r4: Dynamic Kernel Module Support sys-kernel/dracut 059-r15: Generic initramfs generation tool sys-kernel/linux-image-redcore 6.10.14 6.11.10: Redcore Linux Kernel Image 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-r13.ebuild deleted file mode 100644 index 6dcd3345..00000000 --- a/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r13.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=8 - -DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source" -HOMEPAGE="http://www.broadcom.com/support/802.11/" -SRC_BASE="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35" -SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz ) - amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz ) - https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_${PV}.txt -> README-${P}.txt" -LICENSE="Broadcom" -KEYWORDS="amd64" -SLOT="0" -RESTRICT="mirror" - -DEPEND="sys-kernel/dkms" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/makefile.patch - "${FILESDIR}"/eth-to-wlan.patch - "${FILESDIR}"/gcc.patch - "${FILESDIR}"/date-time.patch - "${FILESDIR}"/date-time-error.patch - "${FILESDIR}"/kernel-4.7-to-kernel-5.10.patch - "${FILESDIR}"/kernel-5.17.patch - "${FILESDIR}"/kernel-5.18.patch - "${FILESDIR}"/kernel-6.0.patch - "${FILESDIR}"/kernel-6.1.patch -) - -S="${WORKDIR}" - -src_compile(){ - : -} - -src_install() { - dodir usr/src/${P} - insinto usr/src/${P} - doins -r "${S}"/* - doins "${FILESDIR}"/dkms.conf - dodir etc/modprobe.d - insinto etc/modprobe.d - doins "${FILESDIR}"/"${PN}".conf -} - -pkg_postinst() { - dkms add ${PN}/${PV} -} - -pkg_prerm() { - dkms remove ${PN}/${PV} --all -} diff --git a/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r14.ebuild b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r14.ebuild new file mode 100644 index 00000000..df7ce0d3 --- /dev/null +++ b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r14.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=8 + +DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source" +HOMEPAGE="http://www.broadcom.com/support/802.11/" +SRC_BASE="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35" +SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz ) + amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz ) + https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_${PV}.txt -> README-${P}.txt" +LICENSE="Broadcom" +KEYWORDS="amd64" +SLOT="0" +RESTRICT="mirror" + +DEPEND="sys-kernel/dkms" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/makefile.patch + "${FILESDIR}"/eth-to-wlan.patch + "${FILESDIR}"/gcc.patch + "${FILESDIR}"/date-time.patch + "${FILESDIR}"/date-time-error.patch + "${FILESDIR}"/kernel-4.7-to-kernel-5.10.patch + "${FILESDIR}"/kernel-5.17.patch + "${FILESDIR}"/kernel-5.18.patch + "${FILESDIR}"/kernel-6.0.patch + "${FILESDIR}"/kernel-6.1.patch + "${FILESDIR}"/kernel-6.12.patch +) + +S="${WORKDIR}" + +src_compile(){ + : +} + +src_install() { + dodir usr/src/${P} + insinto usr/src/${P} + doins -r "${S}"/* + doins "${FILESDIR}"/dkms.conf + dodir etc/modprobe.d + insinto etc/modprobe.d + doins "${FILESDIR}"/"${PN}".conf +} + +pkg_postinst() { + dkms add ${PN}/${PV} +} + +pkg_prerm() { + dkms remove ${PN}/${PV} --all +} 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?= +Date: Tue, 10 Dec 2024 09:22:46 +0100 +Subject: [PATCH] wl_linux.c: #include 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 +--- + 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 + #include + #include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include ++#else ++#include ++#endif + + #include + +-- +2.47.1 + -- cgit v1.2.3