Date: Friday, November 30, 2018 @ 17:36:15 Author: eschwartz Revision: 410646
Make custom ${_kernelname}s actually work. It's necessary to distinguish between pkgname and ${_module}. Modified: broadcom-wl/trunk/PKGBUILD ----------+ PKGBUILD | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-11-30 16:21:51 UTC (rev 410645) +++ PKGBUILD 2018-11-30 17:36:15 UTC (rev 410646) @@ -1,8 +1,9 @@ # Maintainer: Eli Schwartz <eschwa...@archlinux.org> -pkgname=broadcom-wl # Build against stock -arch kernel -#pkgname=broadcom-wl-custom # Build agains kernel with a different name -_kernelname=${pkgname#broadcom-wl} +_module=broadcom-wl +_kernelname= # Build against stock -ARCH kernel +#_kernelname=-custom # Build against kernel with a different name +pkgname=${_module}${_kernelname} pkgver=6.30.223.271 pkgrel=62 pkgdesc='Broadcom 802.11 Linux STA wireless driver' @@ -10,7 +11,7 @@ url='https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure' license=('custom') depends=("linux${_kernelname}") -makedepends=("linux${_kernelname}-headers" "${pkgname%$_kernelname}-dkms=${pkgver}") +makedepends=("linux${_kernelname}-headers" "${_module}-dkms=${pkgver}") _extramodules="/usr/lib/modules/extramodules${_kernelname:--ARCH}" @@ -17,7 +18,7 @@ build() { _kernver="$(<${_extramodules}/version)" - dkms build --dkmstree "$srcdir" -m $pkgname/$pkgver -k $_kernver + dkms build --dkmstree "${srcdir}" -m ${_module}/${pkgver} -k ${_kernver} } package() { @@ -24,15 +25,15 @@ _kernver="$(<${_extramodules}/version)" install -Dm644 -t "${pkgdir}${_extramodules}" \ - ${pkgname}/${pkgver}/${_kernver}/${CARCH}/module/*.ko - find "$pkgdir" -name '*.ko' -exec xz -T1 {} + + ${_module}/${pkgver}/${_kernver}/${CARCH}/module/*.ko + find "${pkgdir}" -name '*.ko' -exec xz -T1 {} + - _license="/usr/share/licenses/${pkgname}-dkms/" - if [[ -d $_license ]]; then - install -Dm644 -t "${pkgdir}"/${_license/-dkms/} ${_license}/* + _license="/usr/share/licenses/${_module}-dkms" + if [[ -d ${_license} ]]; then + install -Dm644 -t "${pkgdir}"/${_license/-dkms/${_kernelname}} ${_license}/* fi - _modprobe="/usr/lib/modprobe.d/${pkgname}-dkms.conf" + _modprobe="/usr/lib/modprobe.d/${_module}-dkms.conf" if [[ -r ${_modprobe} ]]; then - install -Dm644 ${_modprobe} "${pkgdir}"/${_modprobe/-dkms/} + install -Dm644 ${_modprobe} "${pkgdir}"/${_modprobe/-dkms/${_kernelname}} fi }