Date: Monday, January 29, 2018 @ 10:43:53 Author: arodseth Revision: 287747
upgpkg: broadcom-wl-dkms 6.30.223.271-16 Added: broadcom-wl-dkms/trunk/008-linux415.patch Modified: broadcom-wl-dkms/trunk/PKGBUILD broadcom-wl-dkms/trunk/broadcom-wl-dkms.install --------------------------+ 008-linux415.patch | 46 +++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 38 ++++++++++++++++++++++--------------- broadcom-wl-dkms.install | 8 +++---- 3 files changed, 73 insertions(+), 19 deletions(-) Added: 008-linux415.patch =================================================================== --- 008-linux415.patch (rev 0) +++ 008-linux415.patch 2018-01-29 10:43:53 UTC (rev 287747) @@ -0,0 +1,46 @@ +--- a/src/wl/sys/wl_linux.c 2017-07-17 00:11:24.000000000 +0100 ++++ b/src/wl/sys/wl_linux.c 2018-01-27 09:49:47.057799596 +0000 +@@ -93,7 +93,11 @@ + + #include <wlc_wowl.h> + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static void wl_timer(struct timer_list *tl); ++#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); + +@@ -2297,10 +2301,17 @@ + atomic_dec(&t->wl->callbacks); + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static void ++wl_timer(struct timer_list *tl) ++{ ++ wl_timer_t *t = (wl_timer_t *)tl; ++#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); +@@ -2352,9 +2363,13 @@ + + bzero(t, sizeof(wl_timer_t)); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ 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; Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-29 09:25:37 UTC (rev 287746) +++ PKGBUILD 2018-01-29 10:43:53 UTC (rev 287747) @@ -3,10 +3,11 @@ # Contributor: Andrey Vihrov <andrey.vih...@gmail.com> # Contributor: Frank Vanderham <twelve.eig...@gmail.com> # Contributor: Jacob McSwain <jacob.a.mcsw...@gmail.com> +# Contributor: Thomas Braby <tho...@mykolab.com> pkgname=broadcom-wl-dkms pkgver=6.30.223.271 -pkgrel=15 +pkgrel=16 pkgdesc='Broadcom 802.11 Linux STA wireless driver' arch=('x86_64') url="https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure" @@ -14,7 +15,8 @@ depends=('dkms') conflicts=('broadcom-wl') install=broadcom-wl-dkms.install -source=('broadcom-wl-dkms.conf' +source=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz" + 'broadcom-wl-dkms.conf' 'dkms.conf.in' '001-null-pointer-fix.patch' '002-rdtscl.patch' @@ -22,10 +24,10 @@ '004-linux48.patch' '005-debian-fix-kernel-warnings.patch' '006-linux411.patch' - '007-linux412.patch') -source_i686=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-${pkgver//./_}.tar.gz") -source_x86_64=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz") -sha256sums=('b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283' + '007-linux412.patch' + '008-linux415.patch') +sha256sums=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be' + 'b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283' '17a4857279d99e14847fa66e8d8ce0d5dc4851856a0683f4a6bfc93f67a8f6f6' '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f' '4ea03f102248beb8963ad00bd3e36e67519a90fa39244db065e74038c98360dd' @@ -33,26 +35,32 @@ '09d709df0c764118ca43117f5c096163d9669a28170da8476d4b8211bd225d2e' '2306a59f9e7413f35a0669346dcd05ef86fa37c23b566dceb0c6dbee67e4d299' '5bc12cb57712e6a944dff1c90de50135c2508085d8497ab99284ccccdb35c32b' - 'a3d13e8abb96ad440dbfae29acae82d31d1ced2ea62052f1efb2c3c4add347ce') -sha256sums_x86_64=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be') -sha256sums_i686=('4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd') + 'a3d13e8abb96ad440dbfae29acae82d31d1ced2ea62052f1efb2c3c4add347ce' + '08c24157cf3b93b60e67e600d1d90223447361990df09acfb00281d79813d167') prepare() { sed -i -e '/BRCM_WLAN_IFNAME/s/eth/wlan/' src/wl/sys/wl_linux.c - sed -i -e "/EXTRA_LDFLAGS/s|\$(src)/lib|/usr/lib/${pkgname}|" Makefile - sed -e "s/@PACKAGE_VERSION@/${pkgver}/" dkms.conf.in > dkms.conf + sed -i -e "/EXTRA_LDFLAGS/s|\$(src)/lib|/usr/lib/$pkgname|" Makefile + sed -e "s/@PACKAGE_VERSION@/$pkgver/" dkms.conf.in > dkms.conf + sed -n -e '/Copyright/,/SOFTWARE\./{s/^ \* //;p}' src/wl/sys/wl_linux.c \ + > LICENSE.module } package() { local dest="$pkgdir/usr/src/${pkgname/-dkms/}-$pkgver" - mkdir -p "$dest" + + install -d "$dest" cp -a src Makefile dkms.conf "$dest" + install -Dm644 -t "$dest/patches" *.patch - install -Dm644 lib/wlc_hybrid.o_shipped "${pkgdir}/usr/lib/${pkgname}/wlc_hybrid.o_shipped" - install -Dm644 broadcom-wl-dkms.conf "${pkgdir}/usr/lib/modprobe.d/broadcom-wl-dkms.conf" + install -Dm644 lib/wlc_hybrid.o_shipped \ + "${pkgdir}/usr/lib/${pkgname}/wlc_hybrid.o_shipped" + install -Dm644 broadcom-wl-dkms.conf \ + "${pkgdir}/usr/lib/modprobe.d/broadcom-wl-dkms.conf" + local ldir="$pkgdir/usr/share/licenses/$pkgname" install -Dm644 lib/LICENSE.txt "${ldir}/LICENSE.shipped" - sed -n -e '/Copyright/,/SOFTWARE\./{s/^ \* //;p}' src/wl/sys/wl_linux.c > "${ldir}/LICENSE.module" + install -Dm644 LICENSE.module "${ldir}/LICENSE.module" } # vim: ts=2 sw=2 et: Modified: broadcom-wl-dkms.install =================================================================== --- broadcom-wl-dkms.install 2018-01-29 09:25:37 UTC (rev 287746) +++ broadcom-wl-dkms.install 2018-01-29 10:43:53 UTC (rev 287747) @@ -1,12 +1,12 @@ post_install() { - cat << EOF || return 1 + cat<<EOF -To load the new module, run as root: +To load the new module, run the following commands as root: - rmmod b43 b43legacy ssb bcm43xx brcm80211 brcmfmac brcmsmac bcma wl + rmmod b43 b43legacy bcm43xx bcma brcm80211 brcmfmac brcmsmac ssb wl modprobe wl -or just reboot the system. +Or just reboot the system. EOF }