From cc9132cbbfb116ec951c9b88b95b20d464af8488 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 13 Oct 2022 22:54:03 +0100 Subject: sys-kernel/bcmwl-dkms : revision bump --- .../md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271 | 14 ------ .../sys-kernel/bcmwl-dkms-6.30.223.271-r1 | 14 ++++++ metadata/pkg_desc_index | 2 +- .../bcmwl-dkms/bcmwl-dkms-6.30.223.271-r1.ebuild | 55 ++++++++++++++++++++++ .../bcmwl-dkms/bcmwl-dkms-6.30.223.271.ebuild | 54 --------------------- sys-kernel/bcmwl-dkms/files/kernel-5.17.patch | 29 ++++++++++++ 6 files changed, 99 insertions(+), 69 deletions(-) delete mode 100644 metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271 create mode 100644 metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r1 create mode 100644 sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r1.ebuild delete mode 100644 sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271.ebuild create mode 100644 sys-kernel/bcmwl-dkms/files/kernel-5.17.patch diff --git a/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271 b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271 deleted file mode 100644 index 14762382..00000000 --- a/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271 +++ /dev/null @@ -1,14 +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=6 -HOMEPAGE=http://www.broadcom.com/support/802.11/ -INHERIT=eutils -KEYWORDS=amd64 -LICENSE=Broadcom -RDEPEND=sys-kernel/dkms -RESTRICT=mirror -SLOT=0 -SRC_URI=amd64? ( http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) -_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=ae3790894787fb92892dd3d2e4f9e392 diff --git a/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r1 b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r1 new file mode 100644 index 00000000..b0dda2f0 --- /dev/null +++ b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r1 @@ -0,0 +1,14 @@ +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=6 +HOMEPAGE=http://www.broadcom.com/support/802.11/ +INHERIT=eutils +KEYWORDS=amd64 +LICENSE=Broadcom +RDEPEND=sys-kernel/dkms +RESTRICT=mirror +SLOT=0 +SRC_URI=amd64? ( http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) +_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c +_md5_=32d044b2d100c235ef9525d6381f50e0 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 61405378..3ad341b5 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -55,7 +55,7 @@ sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go sys-fs/vhba 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sys-fs/zfs 2.1.5: ZFS meta-package (Gentoo compatibility ebuild) sys-fs/zfs-utils 2.1.5: Userland utilities for ZFS Linux kernel module -sys-kernel/bcmwl-dkms 6.30.223.271: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source +sys-kernel/bcmwl-dkms 6.30.223.271-r1: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source sys-kernel/dkms 2.3-r2: Dynamic Kernel Module Support sys-kernel/dracut 056-r10: Generic initramfs generation tool sys-kernel/linux-headers 5.19: Linux system headers diff --git a/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r1.ebuild b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r1.ebuild new file mode 100644 index 00000000..ea214e29 --- /dev/null +++ b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit eutils + +DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source" +HOMEPAGE="http://www.broadcom.com/support/802.11/" +SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35" +SRC_URI="amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )" + +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 +) + +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.ebuild b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271.ebuild deleted file mode 100644 index 32204783..00000000 --- a/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit eutils - -DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source" -HOMEPAGE="http://www.broadcom.com/support/802.11/" -SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35" -SRC_URI="amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )" - -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.18.patch - "${FILESDIR}"/kernel-6.0.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/kernel-5.17.patch b/sys-kernel/bcmwl-dkms/files/kernel-5.17.patch new file mode 100644 index 00000000..9352b3ac --- /dev/null +++ b/sys-kernel/bcmwl-dkms/files/kernel-5.17.patch @@ -0,0 +1,29 @@ +diff -Nur a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c 2022-10-13 22:44:30.922488855 +0100 ++++ b/src/wl/sys/wl_linux.c 2022-10-13 22:48:36.115511672 +0100 +@@ -3307,8 +3307,12 @@ + static ssize_t + wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp) + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0) ++ wl_info_t * wl = pde_data(file_inode(filp)); ++#else + wl_info_t * wl = PDE_DATA(file_inode(filp)); + #endif ++#endif + int bcmerror, len; + int to_user = 0; + char tmp[8]; +@@ -3364,8 +3368,12 @@ + static ssize_t + wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp) + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0) ++ wl_info_t * wl = pde_data(file_inode(filp)); ++#else + wl_info_t * wl = PDE_DATA(file_inode(filp)); + #endif ++#endif + int from_user = 0; + int bcmerror; + -- cgit v1.2.3