libre/tp_smapi: rebuilt against linux-libre 4.20

1 files changed, 14 insertions, 16 deletions

diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index 1963f6c4a..c2f2f3284 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -10,29 +10,28 @@
 # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-_basekernel=4.19
-_archrel=65
+_basekernel=4.20
 _parabolarel=1
 
 pkgname=tp_smapi
 pkgver=0.43
-pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel}
-pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
-arch=('i686' 'x86_64')
+pkgrel=82
+pkgrel+=.parabola${_parabolarel}.basekernel${_basekernel}
+pkgdesc="Modules for ThinkPad's SMAPI functionality"
+pkgdesc+=" (built for the linux-libre kernel package)"
+arch=('x86_64')
+arch+=('i686')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
 
 # Generic (you shouldn't have to modify any of these variables)
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
 depends=("linux-libre>=${_basekernel}" "linux-libre<${_toohigh}")
-makedepends=("linux-libre-headers>=${_basekernel}" "linux-libre-headers<${_toohigh}" "git")
+makedepends=("linux-libre-headers>=${_basekernel}" "linux-libre-headers<${_toohigh}" 'git')
 makedepends+=('libelf')
 
-replaces=("${pkgname}-libre" "${pkgname}-parabola")
-conflicts=("${pkgname}-libre" "${pkgname}-parabola")
-
-_extramodules=extramodules
-_commit=a63729ab30d85430048f65c37f29188ab484cd52 # tags/tp-smapi/0.43
+_extradir=/usr/lib/modules/extramodules
+_commit=a63729ab30d85430048f65c37f29188ab484cd52  # tags/tp-smapi/0.43
 source=("git+https://github.com/evgeni/tp_smapi#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -47,19 +46,18 @@ build() {
   # https://bugs.archlinux.org/task/54975 (kernel has no _GLOBAL_OFFSET_TABLE_):
   # Clear EXTRA_CFLAGS since it defaults to injecting CFLAGS and -fno-plt breaks the modules
 
-  make HDAPS=1 KVER="$(</usr/lib/modules/${_extramodules}/version)" EXTRA_CFLAGS=
+  make HDAPS=1 KVER="$(<$_extradir/version)" EXTRA_CFLAGS=
 }
 
 package() {
   cd $pkgname
 
   # install kernel modules
-  find . -name "*.ko" -exec install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" {} +
+  find . -name "*.ko" -exec install -Dt "$pkgdir$_extradir" {} +
 
   # compress kernel modules
-  find "${pkgdir}" -name "*.ko" -exec xz {} +
+  find "$pkgdir" -name "*.ko" -exec xz {} +
 
   # load module on startup
-  install -dm 755 "${pkgdir}/usr/lib/modules-load.d"
-  echo ${pkgname} > "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
+  echo tp_smapi | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
 }