From 863bdd235321cc544b9fdf404f038433b7cd8e31 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 2 Jan 2023 18:46:45 +0000 Subject: sys-kernel/bcmwl-dkms : kernel 6.1 compat --- .../sys-kernel/bcmwl-dkms-6.30.223.271-r1 | 14 ---- .../sys-kernel/bcmwl-dkms-6.30.223.271-r2 | 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-r2.ebuild | 56 +++++++++++++++ sys-kernel/bcmwl-dkms/files/kernel-6.1.patch | 83 ++++++++++++++++++++++ 6 files changed, 154 insertions(+), 70 deletions(-) delete mode 100644 metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r1 create mode 100644 metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r2 delete mode 100644 sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r1.ebuild create mode 100644 sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r2.ebuild create mode 100644 sys-kernel/bcmwl-dkms/files/kernel-6.1.patch 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 deleted file mode 100644 index f3f16ac0..00000000 --- a/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r1 +++ /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 7eb20ad915a0a318176d51bc2508ff5c edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 37a4612ce5522df5a100359a8dbc8491 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=32d044b2d100c235ef9525d6381f50e0 diff --git a/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r2 b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r2 new file mode 100644 index 00000000..0c6c1c3b --- /dev/null +++ b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r2 @@ -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 7eb20ad915a0a318176d51bc2508ff5c edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 37a4612ce5522df5a100359a8dbc8491 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c +_md5_=5ba1de376b211ea201f98718b9a0ff5e diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 380ba98f..37d2bb18 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -56,7 +56,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.7: ZFS meta-package (Gentoo compatibility ebuild) sys-fs/zfs-utils 2.1.7-r1: Userland utilities for ZFS Linux kernel module -sys-kernel/bcmwl-dkms 6.30.223.271-r1: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source +sys-kernel/bcmwl-dkms 6.30.223.271-r2: 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 deleted file mode 100644 index ea214e29..00000000 --- a/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r1.ebuild +++ /dev/null @@ -1,55 +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.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-r2.ebuild b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r2.ebuild new file mode 100644 index 00000000..3e6c3257 --- /dev/null +++ b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r2.ebuild @@ -0,0 +1,56 @@ +# 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 + "${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/files/kernel-6.1.patch b/sys-kernel/bcmwl-dkms/files/kernel-6.1.patch new file mode 100644 index 00000000..5ececd48 --- /dev/null +++ b/sys-kernel/bcmwl-dkms/files/kernel-6.1.patch @@ -0,0 +1,83 @@ +From a63a5f70e5cf05f6bce4cda2e0dd67462e1d76a5 Mon Sep 17 00:00:00 2001 +From: Joan Bruguera +Date: Mon, 29 Aug 2022 00:06:53 +0200 +Subject: [PATCH] Tentative patch for broadcom-wl 6.30.223.271 driver for Linux 6.1-rc1 + +Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-35 on Arch Linux +--- + src/wl/sys/wl_cfg80211_hybrid.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index 4fef22a..50d1e34 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -105,20 +105,25 @@ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wd + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm); + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++#define MAYBE_INT_LINK_ID int link_id, ++#else ++#define MAYBE_INT_LINK_ID ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) + static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, +- struct net_device *dev, u8 key_idx, bool unicast, bool multicast); ++ struct net_device *dev, MAYBE_INT_LINK_ID u8 key_idx, bool unicast, bool multicast); + #else + static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, + struct net_device *dev, u8 key_idx); + #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params); ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params); + static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr); ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr); + static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr, ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr, + void *cookie, void (*callback) (void *cookie, struct key_params *params)); + #else + static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, +@@ -1165,7 +1170,7 @@ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) + static s32 + wl_cfg80211_config_default_key(struct wiphy *wiphy, +- struct net_device *dev, u8 key_idx, bool unicast, bool multicast) ++ struct net_device *dev, MAYBE_INT_LINK_ID u8 key_idx, bool unicast, bool multicast) + #else + static s32 + wl_cfg80211_config_default_key(struct wiphy *wiphy, +@@ -1190,7 +1195,7 @@ wl_cfg80211_config_default_key(struct wiphy *wiphy, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 + wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params) ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params) + #else + static s32 + wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, +@@ -1311,7 +1316,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 + wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr) ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr) + #else + static s32 + wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, +@@ -1354,7 +1359,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 + wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, +- u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie, ++ MAYBE_INT_LINK_ID u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie, + void (*callback) (void *cookie, struct key_params * params)) + #else + static s32 +-- +2.37.2 + -- cgit v1.2.3