[arch-commits] Commit in broadcom-wl-dkms/trunk (3 files)

[Alexander Rødseth]

    Date: Wednesday, May 12, 2021 @ 10:28:13
  Author: arodseth
Revision: 931443

The wl kernel module conflicts with tg3 FS#70476

Modified:
  broadcom-wl-dkms/trunk/PKGBUILD
  broadcom-wl-dkms/trunk/broadcom-wl-dkms.conf
  broadcom-wl-dkms/trunk/broadcom-wl-dkms.install

--------------------------+
 PKGBUILD                 |   34 ++++++++++++++++------------------
 broadcom-wl-dkms.conf    |    5 +++--
 broadcom-wl-dkms.install |    8 +++-----
 3 files changed, 22 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-12 10:26:56 UTC (rev 931442)
+++ PKGBUILD	2021-05-12 10:28:13 UTC (rev 931443)
@@ -6,7 +6,7 @@
 
 pkgname=broadcom-wl-dkms
 pkgver=6.30.223.271
-pkgrel=26
+pkgrel=27
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch=(x86_64)
 url='https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure'
@@ -28,37 +28,35 @@
         '010-linux56.patch'
         '011-linux59.patch'
         "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
-sha256sums=('b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283'
-            '4bcd3db9008e1bd615788a5a9c8d040d303135cb9d9ff88379a5ec32691e0573'
-            '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f'
-            '4ea03f102248beb8963ad00bd3e36e67519a90fa39244db065e74038c98360dd'
-            '30ce1d5e8bf78aee487d0f3ac76756e1060777f70ed1a9cf95215c3a52cfbe2e'
-            '09d709df0c764118ca43117f5c096163d9669a28170da8476d4b8211bd225d2e'
-            '2306a59f9e7413f35a0669346dcd05ef86fa37c23b566dceb0c6dbee67e4d299'
-            '5bc12cb57712e6a944dff1c90de50135c2508085d8497ab99284ccccdb35c32b'
-            'a3d13e8abb96ad440dbfae29acae82d31d1ced2ea62052f1efb2c3c4add347ce'
-            '08c24157cf3b93b60e67e600d1d90223447361990df09acfb00281d79813d167'
-            '4e73e50653bb612946edd34bf31ca5a0b80f632d47a08766ae6042880927c98d'
-            'f1300bcce93363088481671150ff2bbd6957e12ba11098980b9f428c7a171812'
-            '51ab3d327ec0800106d09678bc51356ec22a2190b1bff8743f8d56b1f83f10c4'
-            '5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be')
+b2sums=('ebb08bcb36762d77e48c713461adb22ac41f2d3409da1244f339ca4c562a99f6c5fe5dec7da3180c2f82e1678f0d7592fae1891f84eef9cf71c81ca6cfade5b1'
+        '07ed5e7771e363628fa2cadb12fb0801162c533802590d969bd6e3438c42fc2fc4523653b1fd8e19fd7a4f5cc82e26c2a7a8a0c8b81dbc4dce42cf79d5d9904f'
+        '038150b9a50025dbd3c81d09755956216b83c0b54db29dc4bfbc3b46bd67cf4640ad643d69ba7f8d486f52cedeb00929b97e02152e72404e6126a05855f97d6f'
+        'bbc80e1ac01683ccc2d940212347fc11c74bdc252d492ca79a292015ac25df6a153ac97cb6c0f0a8d51c1c33d5dc0de4fdd61b1958499b946dc817d29646b72f'
+        'ecf3eb75f8eb3331b0a36b39851536de43cffd3b303db9e9f4fe6fe55d463c3343aba17a99668448427764a719e15e3e862d6a3dc0bc61cb68da9934fb427c6f'
+        '7e091ac44616ea4cfa80b3a5563f4c6a235d2431b911f6bc52074a76b2c1d609dc546430f048abf042f862907f573c6b1dfa24c8c424aeefe73ff13ae3f34900'
+        '3b65cccde7ed80bd88bf945cca6b71fca9eccc4a910666dad4df56a24471535e1d6007e1ea24567002c927357b525683b02c6a7ad2986aca738fc81ab736219f'
+        '28ef5e50fa11fc15b409f3b3ee42aaf329756354ba8b7923d1b27939a6b21bd64b72a4adfb2eeff3c48bb8c4c1bc4294e8fd7744b83768974bf5d0592e20c148'
+        '8954b0005b84be6028affd21c114efe1ed3ffa3a3f5653b86fb8ece1850adcd0675649ce7faa418afaf48eb0ac4c9f4c1c0f7e19a5d1371b491b4a6130f70360'
+        '091e1da266ebaa0d429663facf3e81c849fe900c446e1c270ba23b65c15a99efeb1ae6c20905dfcc21b5f4bc3f91b32eb3b7bc9841f2a23508c71312403af774'
+        'bf06e3046cf47debaa508ed11d3f8047424cd16ed7a044dc16a0dc94949ff280c2dc63683e69700a0930b6e0e66bb376b1e366c21a6076f8b56ddc8e06ba0794'
+        '21f7fc163ffcf6857f3a21a8519a42600fd6b3658d14b32191ef1142c817c10c8dc691a3bc39228927ac29d7b7ac5c3a62eb786853046bacb9cc74efb51b6cb0'
+        'c1f522f6554a7bfe0f7b789b042ada14316ecc87bc196c83bec95f684152f323a4c31f60ff26843e36338b8c7949bf36719a5c8afa439ff71f7c74dae4c755b6'
+        'e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a')
 
 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 -n -e '/Copyright/,/SOFTWARE\./{s/^ \* //;p}' src/wl/sys/wl_linux.c
   sed -i '/GE_49 :=/s|:= .*|:= 1|' Makefile
+  true
 }
 
 package() {
   local dest="$pkgdir/usr/src/${pkgname/-dkms/}-$pkgver"
-
   install -Dm644 Makefile "$dest/Makefile"
   install -Dm644 dkms.conf "$dest/dkms.conf"
   install -Dm644 -t "$dest/patches" *.patch
   cp -a src "$dest"
-
   install -Dm644 lib/wlc_hybrid.o_shipped \
     "$pkgdir/usr/lib/$pkgname/wlc_hybrid.o_shipped"
   install -Dm644 broadcom-wl-dkms.conf \

Modified: broadcom-wl-dkms.conf
===================================================================
--- broadcom-wl-dkms.conf	2021-05-12 10:26:56 UTC (rev 931442)
+++ broadcom-wl-dkms.conf	2021-05-12 10:28:13 UTC (rev 931443)
@@ -1,8 +1,9 @@
 blacklist b43
 blacklist b43legacy
-blacklist ssb
 blacklist bcm43xx
+blacklist bcma
 blacklist brcm80211
 blacklist brcmfmac
 blacklist brcmsmac
-blacklist bcma
+blacklist ssb
+blacklist tg3

Modified: broadcom-wl-dkms.install
===================================================================
--- broadcom-wl-dkms.install	2021-05-12 10:26:56 UTC (rev 931442)
+++ broadcom-wl-dkms.install	2021-05-12 10:28:13 UTC (rev 931443)
@@ -1,16 +1,14 @@
 post_install() {
   cat<<EOF
 
-To load the new module, run the following commands as root:
+Unload and load kernel modules (wl is provided by broadcom-wl-dkms):
 
-  rmmod b43 b43legacy bcm43xx bcma brcm80211 brcmfmac brcmsmac ssb wl
+  rmmod b43 b43legacy bcm43xx bcma brcm80211 brcmfmac brcmsmac ssb tg3 wl
   modprobe wl
 
-Or just reboot the system.
-
 EOF
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }