acpi_call-1.1.0-301.parabola1.basekernel5.5.13: rebuild

2 files changed, 14 insertions, 52 deletions

diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index 0f5b4a159..0625cb176 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -5,12 +5,11 @@
 # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-_basekernel=5.4.12-1
+_basekernel=5.5.13-1
 
-pkgbase=acpi_call
-pkgname=(acpi_call acpi_call-dkms)
+pkgname=acpi_call
 pkgver=1.1.0
-pkgrel=235
+pkgrel=301
 pkgrel+=.parabola1.basekernel${_basekernel%-*}
 pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call'
 pkgdesc+=' (built for the linux-libre kernel package)'
@@ -18,53 +17,25 @@ url='https://github.com/mkottman/acpi_call'
 arch=('x86_64')
 arch+=('i686')
 license=('GPL')
-makedepends=(linux-libre-headers=${_basekernel%-*} git libelf)
-source=("acpi_call-${pkgver}.tar.gz::https://github.com/mkottman/acpi_call/archive/v${pkgver}.tar.gz"
-        dkms.conf)
-sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0'
-            '32e6ea6523b13132c6c7838bba7fbf3d040ba2d35a892c2c356245612720df8a')
-
-prepare() {
-  cd $pkgbase-$pkgver
-
-  # Fix build with Linux-libre >= 3.17-gnu
-  sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c
-
-  # Fix build with Linux-libre >= 4.12-gnu
-  sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c
-}
+makedepends=("linux-libre-headers=${_basekernel%-*}" "acpi_call-dkms=$pkgver")
+conflicts=('acpi_call-dkms')
 
 build() {
-  cd $pkgbase-$pkgver
-  make KVERSION="$(</usr/src/linux-libre/version)"
-}
+  _kernver=$(</usr/src/linux-libre/version)
 
-package_acpi_call() {
-  depends=(linux-libre=${_basekernel%-*})
-
-  cd $pkgbase-$pkgver
-  _extradir="/usr/lib/modules/$(</usr/src/linux-libre/version)/extramodules"
-  install -Dt "$pkgdir$_extradir" -m644 *.ko
-  find "$pkgdir" -name '*.ko' -exec xz {} +
-
-  echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
-
-  mkdir -p "$pkgdir/usr/share/acpi_call"
-  cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support
+  dkms build --dkmstree "$srcdir" -m acpi_call/$pkgver -k $_kernver
 }
 
-package_acpi_call-dkms() {
-  depends=(dkms)
-  provides=("acpi_call=$pkgver-${pkgrel%%.*}")
-  conflicts=(acpi_call)
+package() {
+  depends=(linux-libre=${_basekernel%-*})
 
-  cd $pkgbase-$pkgver
-  install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile acpi_call.c ../dkms.conf
+  _kernver=$(</usr/src/linux-libre/version)
 
-  echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call.conf"
+  install -Dt "$pkgdir/usr/lib/modules/$_kernver/extramodules" -m0644 \
+    acpi_call/${pkgver}/$_kernver/$CARCH/module/*
 
-  mkdir -p "$pkgdir/usr/share/acpi_call"
-  cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support
+  # compress each module individually
+  find "$pkgdir" -name '*.ko' -exec xz -T1 {} +
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/acpi_call/dkms.conf b/libre/acpi_call/dkms.conf
deleted file mode 100644
index edc5c2482..000000000
--- a/libre/acpi_call/dkms.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-PACKAGE_NAME="acpi_call"
-PACKAGE_VERSION="#MODULE_VERSION#"
-AUTOINSTALL="yes"
-
-MAKE[0]="make KVERSION=$kernelver"
-CLEAN="make clean"
-
-BUILT_MODULE_NAME[0]="acpi_call"
-DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi"