[arch-commits] Commit in broadcom-wl/trunk (PKGBUILD)

[Jan Steffens]

    Date: Thursday, August 2, 2018 @ 05:23:47
  Author: heftig
Revision: 367217

6.30.223.271-35: kernel 4.17.11.arch1-2

Modified:
  broadcom-wl/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-02 05:23:45 UTC (rev 367216)
+++ PKGBUILD	2018-08-02 05:23:47 UTC (rev 367217)
@@ -5,7 +5,7 @@
 #pkgname=broadcom-wl-custom    # Build agains kernel with a different name
 _kernelname=${pkgname#broadcom-wl}
 pkgver=6.30.223.271
-pkgrel=34
+pkgrel=35
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch=('x86_64')
 url='https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure'
@@ -13,18 +13,18 @@
 depends=("linux${_kernelname}")
 makedepends=("linux${_kernelname}-headers" "${pkgname%$_kernelname}-dkms=${pkgver}")
 
+_extramodules="/usr/lib/modules/extramodules${_kernelname:--ARCH}"
+
 build() {
-    _kernmajor="$(pacman -Q linux${_kernelname} | sed -r 's/linux'"${_kernelname}"' ([0-9]*.[0-9]*).*/\1/')"
-    _kernver="$(</usr/lib/modules/extramodules-"${_kernmajor}${_kernelname}"/version)"
+    _kernver="$(<${_extramodules}/version)"
 
     dkms build --dkmstree "$srcdir" -m $pkgname/$pkgver -k $_kernver
 }
 
 package() {
-    _kernmajor="$(pacman -Q linux${_kernelname} | sed -r 's/linux'"${_kernelname}"' ([0-9]*.[0-9]*).*/\1/')"
-    _kernver="$(</usr/lib/modules/extramodules-${_kernmajor}${_kernelname}/version)"
+    _kernver="$(<${_extramodules}/version)"
 
-    install -Dm644 -t "${pkgdir}/usr/lib/modules/extramodules-${_kernmajor}${_kernelname}" \
+    install -Dm644 -t "${pkgdir}${_extramodules}" \
         ${pkgname}/${pkgver}/${_kernver}/${CARCH}/module/*.ko
     find "$pkgdir" -name '*.ko' -exec xz -T1 {} +