diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-27 22:40:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-27 22:40:05 +0100 |
| commit | 8c364c784966be1700ea39ae45028f3e9be9cae0 (patch) | |
| tree | c1971211069b79e3831b71accd52a67a9fdc77a3 /net-wireless/broadcom-sta | |
| parent | 6bd95d1f6320b8666a31ec949183aaa3088aa16f (diff) | |
gentoo resync : 27.03.2018
Diffstat (limited to 'net-wireless/broadcom-sta')
4 files changed, 84 insertions, 5 deletions
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest index d209861cd6d8..d53cf90f1c5c 100644 --- a/net-wireless/broadcom-sta/Manifest +++ b/net-wireless/broadcom-sta/Manifest @@ -6,10 +6,11 @@ AUX broadcom-sta-6.30.223.271-r1-linux-3.18.patch 326 BLAKE2B 9c7069c310983625ff AUX broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch 408 BLAKE2B f7a01e470641b7a19cb649ceafe9c37d882dc2271fdec0e027919a8d3ed119663480a7eed645116b20b72f90cd96acc8c9e49afc570404ba51a36ef3697ca9c5 SHA512 d419d776bb8a0071250eb26d1e878639df35272dc47a8eb459f426356fadb0ab25779a90dd1317711c94549ec45f80b70fca9677c93c37cac829913120cc80d4 AUX broadcom-sta-6.30.223.271-r4-linux-4.11.patch 1588 BLAKE2B 4212e27fa627da17bb46ddabb278ecf927d90263a8a3e44253663ee5171b38d854e07d4ca3372a412cb8fee0c21d04db18fa870cd6a2f5432376ac20694c801d SHA512 c134b34dcb4221f59de6cc9afcfb47c459ee840189c4b317f9440df3dab0c3fdf5a8798850c7335fbc05c904c9b224e6bc0457f2d33b04bef550c2d92a92cf20 AUX broadcom-sta-6.30.223.271-r4-linux-4.12.patch 2320 BLAKE2B 9595273b57d76585f6cf7179342979911e5cfd0bc77eda1c1c5d90751c51dad8f8eb3d5c836a2618327e4b9fcae31908aad1f920c58de5c2cf9aa70e3d8e0f2d SHA512 4eecf21bf95943150db8f7bc0a3bd4634050095cc6b2a91164590e3d0887fd37d4425b27537cb63e2ece26596b85eb1f0aef52624a390015a61868d7d807dd2b +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 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 3587 BLAKE2B 7c8786b280a7e1b431ec0d5c5c96e83d6b32db332019ec79900db30573bdd11d8b609f8345db824b8fcbec8653b4c64ec05e5d8c8dd37efdd301845be7233e6e SHA512 2e2753189b95190742c2a27ae0ac2e08518619d436400451299fdd4e062fbb6305aa1741d808ff8d5f2290d59ce910f16b7c1bb03aa757ca14d9fb19d756b05f -MISC metadata.xml 318 BLAKE2B 22208f950570aa171e6a875c4bb7c3db99ead1b5f3fd6277cb598c5c30cf5f45efaff98e5ecf49ce85321b09741615f7330374b71d554bb7c621700acfac42e5 SHA512 adcf2e6634f5191a961818253a45ca8bd1ff9ae5bdccf77c56b12eed4c1fd75aa0a4f7b4d6e8119ecc2f5f60268e11a3903ab1ed5d965079a8c1f164c7465794 +EBUILD broadcom-sta-6.30.223.271-r4.ebuild 3762 BLAKE2B d9b88f48c6d2b02e86af439f9e998cfdccd12fc897f7859047a129a82be0edbaaf1d131c1380e87531d8b1ade41b0cb1af32927c302dade59634d75a3fe014b9 SHA512 b3f4413ac8cd1e664f08ff3e7ac49762551dc95685819ce42267078e0cdf7df4d44e30f964462498781447abb98d86124af986f43a004b129074c58f27087055 +MISC metadata.xml 707 BLAKE2B 8ba84fe1bcf956c9baae7e38445aebc07b35cc35141cfbaa915f762e6b72e839f4620edccdf0db397d3d26e5b7338464c016a2dbaaeca6eb9e2d5d19b634950e SHA512 bc84bcca096b194e4ec8248e66fae2b39de30af81d36de2cc8b67cd0e8d45db29c9380042d38513b1219f5c24823b24f81ff7403c0a04fff12778ada30821d80 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 index 34b37eceeaf8..95eeba5c4831 100644 --- 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -43,7 +43,7 @@ pkg_setup() { # NOTE<lxnay>: 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" + 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!" @@ -52,6 +52,7 @@ pkg_setup() { 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 @@ -81,7 +82,8 @@ src_prepare() { "${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.12.patch" \ + "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch" epatch_user } diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.15.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.15.patch new file mode 100644 index 000000000000..91c4d89519c1 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.15.patch @@ -0,0 +1,63 @@ +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 489c9f5..f8278ad 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -93,7 +93,11 @@ + + #include <wlc_wowl.h> + ++#ifdef HAVE_TIMER_SETUP ++static void wl_timer(struct timer_list *list); ++#else + static void wl_timer(ulong data); ++#endif + static void _wl_timer(wl_timer_t *t); + static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); + +@@ -2296,12 +2300,17 @@ + + atomic_dec(&t->wl->callbacks); + } +- ++#ifdef HAVE_TIMER_SETUP ++static void ++wl_timer(struct timer_list *list) ++{ ++ wl_timer_t *t = from_timer(t,list,timer); ++#else + static void + wl_timer(ulong data) + { + wl_timer_t *t = (wl_timer_t *)data; +- ++#endif + if (!WL_ALL_PASSIVE_ENAB(t->wl)) + _wl_timer(t); + else +@@ -2351,10 +2360,13 @@ + } + + bzero(t, sizeof(wl_timer_t)); +- ++#ifdef HAVE_TIMER_SETUP ++ timer_setup(&t->timer, wl_timer,0); ++#else + init_timer(&t->timer); + t->timer.data = (ulong) t; + t->timer.function = wl_timer; ++#endif + t->wl = wl; + t->fn = fn; + t->arg = arg; +diff --git a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h +index 489c9f5..f8278ad 100644 +--- a/src/wl/sys/wl_linux.h ++++ b/src/wl/sys/wl_linux.h +@@ -190,3 +190,7 @@ + extern struct net_device * wl_netdev_get(wl_info_t *wl); + + #endif ++ ++#if defined(timer_setup) && defined(from_timer) ++#define HAVE_TIMER_SETUP ++#endif diff --git a/net-wireless/broadcom-sta/metadata.xml b/net-wireless/broadcom-sta/metadata.xml index 29b7c78b10d7..ded3ea021204 100644 --- a/net-wireless/broadcom-sta/metadata.xml +++ b/net-wireless/broadcom-sta/metadata.xml @@ -5,6 +5,19 @@ <email>tomboy64@sina.cn</email> <name>M.B.</name> </maintainer> + <maintainer type="person"> + <email>commendsarnex@gmail.com</email> + <name>Nick Sarnie</name> + <description>Proxy co-maintainer</description> + </maintainer> + <maintainer type="person"> + <email>eva@gentoo.org</email> + <name>Gilles Dartiguelongue</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="launchpad">~albertomilone</remote-id> </upstream> |