From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- net-wireless/broadcom-sta/Manifest | 5 +- .../broadcom-sta-6.30.223.271-r4.ebuild | 95 ---------------------- .../broadcom-sta-6.30.223.271-r5.ebuild | 93 +++++++++++++++++++++ .../files/broadcom-sta-6.30.223.141-makefile.patch | 4 +- .../broadcom-sta-6.30.223.271-r5-linux-5.1.patch | 29 +++++++ 5 files changed, 127 insertions(+), 99 deletions(-) delete mode 100644 net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild create mode 100644 net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild create mode 100644 net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch (limited to 'net-wireless/broadcom-sta') diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest index b4a97f33ae91..4e46a78ad875 100644 --- a/net-wireless/broadcom-sta/Manifest +++ b/net-wireless/broadcom-sta/Manifest @@ -1,6 +1,6 @@ AUX broadcom-sta-6.30.223.141-eth-to-wlan.patch 395 BLAKE2B 80ee748c37774a85b5591601c81beca81ae2924a63bb76fbaa5914e9d2ff6344765ca1de334ae39af8f7e027af2da859512f4110d0b334e6b18d713186d20817 SHA512 1b340746e47edcc63cacf454fc44cd40ac34e526dacb026602e629b16030eeab0919456cadad7f93662291c1a0bea461c25471a7b71b7e9a1103f88e7d92be5d AUX broadcom-sta-6.30.223.141-gcc.patch 316 BLAKE2B 862f4c5a2284d5e2adb6d76c803d7fafe242ed3b69f526237ad231641c1160890ccbc4a8d2bc3e474176195d1bba6c68352afb47bcd619539b5b90fbbd8739e5 SHA512 a298ff51359da6fd5f47ca63e99babc778a95622687c205cca4244d16552fc697f46f90cadc93fc8e8d6674965b3641a0d22d35c5f14d6d86cf3215a71db6172 -AUX broadcom-sta-6.30.223.141-makefile.patch 497 BLAKE2B 17cf5baf3214ac5d75ad2918c74861b36e0ba56d757a2c5edb30599fa98be54b8fb7bdaf14b4339a0e6fbc748316c59a51319f8196454318b34fe85dec9aeba6 SHA512 f403669dede71f3c9f2886bfa535518a9e89a4398d1da7789ff955f15c493dd5ede1f304b0980c300c580ac1ae2464a4e395fb40b72dffa98a5a015c3e7d74c5 +AUX broadcom-sta-6.30.223.141-makefile.patch 497 BLAKE2B 49048dc09a76bf7bbb804d49415c3ae8a3b2d4236543a5940e7a1a22874f12a8ea8152dfc161d471edf0d5d71bdf111c6910c0ff98dc0350e3d66de4ceb28935 SHA512 31be005e4a2ed48e4d932ae902cd180e87167e3cc3d8892ea25e2cc3619a2843fbbfe769d0ef3cc11709841765aef5090185d49d98deffe14773dd5ca567218b AUX broadcom-sta-6.30.223.248-r3-Wno-date-time.patch 380 BLAKE2B d0398b0d856a1abb34e42f1ad2d1cfcf4c6203a82c251a40562c15ba46b1c8cd0a6cc1bedcdf576e02cc671b56f1f2da826dd0781df0308f7c8fac8387413293 SHA512 f1f96ac2b51be18bfdc4c3d627801cb14d024def92416434c3c0a9adb986e846f9ceb6087b5ab343d78ed87a3dda277818cb060534b44be62bf8f123bc6594fd AUX broadcom-sta-6.30.223.271-r1-linux-3.18.patch 326 BLAKE2B 9c7069c310983625ff1c8a956ea2e856e24c429791197b3e7e1131189fbf9e4b44e3e33cad672ffec44017779300bae3462b175399b1b4dcc2481f1f7b429d45 SHA512 bdc7f810bf01446e9752e664030e570396127a674b397ecd0001a0ff79103a891e5011975a819d3decfb8cc4dc90e7655621753c76ccc07bde99a2610f188587 AUX broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch 408 BLAKE2B f7a01e470641b7a19cb649ceafe9c37d882dc2271fdec0e027919a8d3ed119663480a7eed645116b20b72f90cd96acc8c9e49afc570404ba51a36ef3697ca9c5 SHA512 d419d776bb8a0071250eb26d1e878639df35272dc47a8eb459f426356fadb0ab25779a90dd1317711c94549ec45f80b70fca9677c93c37cac829913120cc80d4 @@ -9,8 +9,9 @@ AUX broadcom-sta-6.30.223.271-r4-linux-4.12.patch 2320 BLAKE2B 9595273b57d76585f AUX broadcom-sta-6.30.223.271-r4-linux-4.15.patch 1343 BLAKE2B ca87ae817cefd6436da9ba827c2aa83fec0b7b1e0d837842d857fdba0ba88b52cfd8eec0beddfdb67f08870d6bc2f8f3d3d0bc0fdeeab8fe849eb704dfd8f8a2 SHA512 5558ee1b82f62250e64e3fe71b340698d48325f43bb774be00dc3557c3789b7180282082905e21cf97316b70fd6de5941521db198dd2b6396903ab31465f336b AUX broadcom-sta-6.30.223.271-r4-linux-4.7.patch 3897 BLAKE2B ecf3eb75f8eb3331b0a36b39851536de43cffd3b303db9e9f4fe6fe55d463c3343aba17a99668448427764a719e15e3e862d6a3dc0bc61cb68da9934fb427c6f SHA512 f61ecfb6b8c5a377c7a4da7549c9ec75677782fa2f97e64de0df1259e0ec3b993cfa3eaa4ff50331703ee18ef28f2af0d09839dd3b63ed994e6b29cbfe8ed73f AUX broadcom-sta-6.30.223.271-r4-linux-4.8.patch 1835 BLAKE2B 7e091ac44616ea4cfa80b3a5563f4c6a235d2431b911f6bc52074a76b2c1d609dc546430f048abf042f862907f573c6b1dfa24c8c424aeefe73ff13ae3f34900 SHA512 e5959921b6f0cd5d61d7ed568f549b0920f394458c28257c05064b89d7067ce11c8e44ed0e5a48a65bd041c6193d9ae2d02fca2f5efbfb787d3f9001786a4578 +AUX broadcom-sta-6.30.223.271-r5-linux-5.1.patch 829 BLAKE2B 7bb59009307d423e72832d14114b7e6bd016717ace260174b2b9dbc909ec7eb962aec88d930f34ee6c09165e937a2cc271eac7e6b214fe8161a8f76af1aaa83c SHA512 e8780fbff3ed0640b30b44ca777d56bdcf8b23702d4fa827c843919658f022090ca3e2533541f577e7b49133cb2bb3d6ec85bcc9c023a82bea892e231f01a550 DIST README-broadcom-sta-6.30.223.271.txt 17216 BLAKE2B af6db6e129911d1589d7d6cb7166bee32ce1ca98a4e5c9b3515a44e48681d8a7a7a6b697419b2bcd9c46f0f4ca1f7ece632b63531b4a4ecd91df4f9dddf043c9 SHA512 672ecc5afcd8535a9f8beb4baea5a40c584b7682844e9ff0e4f66b7406b42118a99dce1fcd580118187fdc506781334b8243082def2b78dce916d90c55ab3663 DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 BLAKE2B 2e3189c468cec50b1a980452a4b2bd0f9657d9adf6fae2a95a8b1c2d1df2f5f6beb4cb903f72f444eddf823fe4375299864cd62191c9d59c4f77598b5d3aa246 SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 BLAKE2B e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17 -EBUILD broadcom-sta-6.30.223.271-r4.ebuild 3762 BLAKE2B d9b88f48c6d2b02e86af439f9e998cfdccd12fc897f7859047a129a82be0edbaaf1d131c1380e87531d8b1ade41b0cb1af32927c302dade59634d75a3fe014b9 SHA512 b3f4413ac8cd1e664f08ff3e7ac49762551dc95685819ce42267078e0cdf7df4d44e30f964462498781447abb98d86124af986f43a004b129074c58f27087055 +EBUILD broadcom-sta-6.30.223.271-r5.ebuild 3763 BLAKE2B 923c9cf82aa607b7a980c2e8608cdba9ba7c2f1ed76da5f16f648e7a2f6e35e29d32c5264999c78c14b5984aed5bdfd6616d5d17b9988de61740cb443a880281 SHA512 b11a485700e3efb06c310a3b296414dce84ce248db166f8efb04254128e7efc5132ecdf4adcf11cb5c254701f590812a850de7d4c8aa0bca79284eeb514afd55 MISC metadata.xml 333 BLAKE2B 0634d9cb768f942e912418540c980cfb5027423f9bde64faaa8ad0179a798fe98b0d93c3a5d259c74609acc213ddcd73addd3799671e5215cf636dd9d4429f45 SHA512 d792d7293edec312c9da7f4db8162cb415bfee561302d7523b3398132c31cd4dcf638e0c815c0046dea81b7de2642d31407b38a8612e04090e0f3ed608b202df diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild deleted file mode 100644 index 95eeba5c4831..000000000000 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils linux-info linux-mod - -DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" -HOMEPAGE="https://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 ~x86" - -RESTRICT="mirror" - -DEPEND="virtual/linux-sources" -RDEPEND="" - -S="${WORKDIR}" - -MODULE_NAMES="wl(net/wireless)" -MODULESD_WL_ALIASES=("wlan0 wl") - -pkg_pretend() { - ewarn - ewarn "If you are stuck using this unmaintained driver (likely in a MacBook)," - ewarn "you may be interested to know that a newer compatible wireless card" - ewarn "is supported by the in-tree brcmfmac driver. It has a model number " - ewarn "BCM943602CS and is for sale on the second hand market for less than " - ewarn "20 USD." - ewarn - ewarn "See https://wikidevi.com/wiki/Broadcom_Wireless_Adapters and" - ewarn " https://wikidevi.com/wiki/Broadcom_BCM943602CS" - ewarn "for more information." - ewarn -} - -pkg_setup() { - # bug #300570 - # NOTE: module builds correctly anyway with b43 and SSB enabled - # make checks non-fatal. The correct fix is blackisting ssb and, perhaps - # b43 via udev rules. Moreover, previous fix broke binpkgs support. - CONFIG_CHECK="~!B43 ~!BCMA ~!SSB ~!X86_INTEL_LPSS" - CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" - ERROR_B43="B43: If you insist on building this, you must blacklist it!" - ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!" - ERROR_SSB="SSB: If you insist on building this, you must blacklist it!" - ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice." - ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!" - ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else." - ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA." - ERROR_X86_INTEL_LPSS="X86_INTEL_LPSS: Please disable it. The module does not work with it enabled." - if kernel_is ge 3 8 8; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT" - elif kernel_is ge 2 6 32; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211" - elif kernel_is ge 2 6 31; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211" - elif kernel_is ge 2 6 29; then - CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS" - else - CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP" - fi - - linux-mod_pkg_setup - - BUILD_PARAMS="-C ${KV_DIR} M=${S}" - BUILD_TARGETS="wl.ko" -} - -src_prepare() { - epatch \ - "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \ - "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \ - "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch" \ - "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch" - - epatch_user -} - -src_install() { - linux-mod_src_install - - dodoc "${DISTDIR}/README-${P}.txt" -} diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild new file mode 100644 index 000000000000..91581b52a4e4 --- /dev/null +++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit eutils linux-info linux-mod + +DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" +HOMEPAGE="https://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 ~x86" + +RESTRICT="mirror" + +DEPEND="virtual/linux-sources" +RDEPEND="" + +S="${WORKDIR}" + +MODULE_NAMES="wl(net/wireless)" +MODULESD_WL_ALIASES=("wlan0 wl") + +pkg_pretend() { + ewarn + ewarn "If you are stuck using this unmaintained driver (likely in a MacBook)," + ewarn "you may be interested to know that a newer compatible wireless card" + ewarn "is supported by the in-tree brcmfmac driver. It has a model number " + ewarn "BCM943602CS and is for sale on the second hand market for less than " + ewarn "20 USD." + ewarn + ewarn "See https://wikidevi.com/wiki/Broadcom_Wireless_Adapters and" + ewarn " https://wikidevi.com/wiki/Broadcom_BCM943602CS" + ewarn "for more information." + ewarn +} + +pkg_setup() { + # bug #300570 + # NOTE: module builds correctly anyway with b43 and SSB enabled + # make checks non-fatal. The correct fix is blackisting ssb and, perhaps + # b43 via udev rules. Moreover, previous fix broke binpkgs support. + CONFIG_CHECK="~!B43 ~!BCMA ~!SSB ~!X86_INTEL_LPSS" + CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" + ERROR_B43="B43: If you insist on building this, you must blacklist it!" + ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!" + ERROR_SSB="SSB: If you insist on building this, you must blacklist it!" + ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice." + ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!" + ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else." + ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA." + ERROR_X86_INTEL_LPSS="X86_INTEL_LPSS: Please disable it. The module does not work with it enabled." + if kernel_is ge 3 8 8; then + CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT" + elif kernel_is ge 2 6 32; then + CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211" + elif kernel_is ge 2 6 31; then + CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211" + elif kernel_is ge 2 6 29; then + CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS" + else + CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP" + fi + + linux-mod_pkg_setup + + BUILD_PARAMS="-C ${KV_DIR} M=${S}" + BUILD_TARGETS="wl.ko" +} + +PATCHES=( + "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" + "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" + "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" + "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" + "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" + "${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch" + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch" + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch" + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch" + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch" + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch" + "${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.1.patch" +) + +src_install() { + linux-mod_src_install + + dodoc "${DISTDIR}/README-${P}.txt" +} diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch index 09c495d2a10f..d5b97fe87ebe 100644 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.old 2013-04-28 22:42:59.000000000 +0200 -+++ Makefile 2013-04-28 22:45:53.000000000 +0200 +--- a/Makefile 2013-04-28 22:42:59.000000000 +0200 ++++ b/Makefile 2013-04-28 22:45:53.000000000 +0200 @@ -128,9 +128,9 @@ EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch new file mode 100644 index 000000000000..fcee46ea3d02 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch @@ -0,0 +1,29 @@ +From 20bb1a6da26c496572ee63d310cdf69a2f1553f8 Mon Sep 17 00:00:00 2001 +From: Seth Forshee +Date: Fri, 17 May 2019 20:32:20 +0000 +Subject: [PATCH] add support for linux 5.1 + +get_ds() was removed and replaced universally with KERNEL_DS. +Provide a version of get_ds() to do likewise for 5.1 and later. + +Signed-off-by: Seth Forshee +--- + src/include/linuxver.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/include/linuxver.h b/src/include/linuxver.h +index b05bc32..2b88b30 100644 +--- a/src/include/linuxver.h ++++ b/src/include/linuxver.h +@@ -591,4 +591,9 @@ do { \ + #define netdev_priv(dev) dev->priv + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) ++#include ++#define get_ds() (KERNEL_DS) ++#endif ++ + #endif +-- +2.20.1 -- cgit v1.2.3