[arch-commits] Commit in acpi_call/trunk (PKGBUILD acpi_call.install dkms.conf)

[Jan Steffens]

    Date: Saturday, November 18, 2017 @ 23:18:42
  Author: heftig
Revision: 267369

1.1.0-78

Added:
  acpi_call/trunk/dkms.conf
Modified:
  acpi_call/trunk/PKGBUILD
Deleted:
  acpi_call/trunk/acpi_call.install

-------------------+
 PKGBUILD          |   56 +++++++++++++++++++++++++++++++---------------------
 acpi_call.install |   14 -------------
 dkms.conf         |    9 ++++++++
 3 files changed, 43 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-18 21:21:04 UTC (rev 267368)
+++ PKGBUILD	2017-11-18 23:18:42 UTC (rev 267369)
@@ -3,22 +3,24 @@
 # Contributor: mortzu <me at mortzu.de>
 # Contributor: fnord0 <fnord0 at riseup.net>
 
-pkgname=acpi_call
+pkgbase=acpi_call
+pkgname=(acpi_call acpi_call-dkms)
 pkgver=1.1.0
-pkgrel=77
-_extramodules=extramodules-4.13-ARCH
+pkgrel=78
 pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call'
+url='https://github.com/mkottman/acpi_call'
 arch=('x86_64')
-url='https://github.com/mkottman/acpi_call'
 license=('GPL')
-depends=('linux>=4.13' 'linux<4.14')
-makedepends=('linux-headers>=4.13' 'linux-headers<4.14')
-install='acpi_call.install'
-source=("acpi_call-${pkgver}.tar.gz::https://github.com/mkottman/acpi_call/archive/v${pkgver}.tar.gz")
-sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0')
+depends=('linux>=4.14' 'linux<4.15')
+makedepends=('linux-headers>=4.14' 'linux-headers<4.15')
+_extramodules=extramodules-4.14-ARCH
+source=("acpi_call-${pkgver}.tar.gz::https://github.com/mkottman/acpi_call/archive/v${pkgver}.tar.gz"
+        dkms.conf)
+sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0'
+            '32e6ea6523b13132c6c7838bba7fbf3d040ba2d35a892c2c356245612720df8a')
 
 prepare() {
-  cd acpi_call-${pkgver}
+  cd $pkgbase-$pkgver
 
   # Fix build with Linux >= 3.17
   sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c
@@ -28,23 +30,33 @@
 }
 
 build() {
-  cd acpi_call-${pkgver}
+  cd $pkgbase-$pkgver
+  make KVERSION="$(cat /usr/lib/modules/$_extramodules/version)"
+}
 
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+package_acpi_call() {
+  cd $pkgbase-$pkgver
+  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 acpi_call.ko
+  find "$pkgdir" -name '*.ko' -exec gzip -n {} +
 
-  make KVERSION="${_kernver}"
+  echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call.conf"
+
+  mkdir -p "$pkgdir/usr/share/acpi_call"
+  cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support
 }
 
-package() {
-  cd acpi_call-${pkgver}
+package_acpi_call-dkms() {
+  depends=(dkms)
+  provides=("acpi_call=$pkgver-$pkgrel")
+  conflicts=(acpi_call)
 
-  install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d}
-  install -m 644 acpi_call.ko "${pkgdir}"/usr/lib/modules/${_extramodules}
-  gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/acpi_call.ko
-  echo acpi_call > "${pkgdir}"/usr/lib/modules-load.d/acpi_call.conf
+  cd $pkgbase-$pkgver
+  install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile acpi_call.c ../dkms.conf
 
-  install -dm 755 "${pkgdir}"/usr/share/acpi_call
-  cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/acpi_call/
+  echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call.conf"
+
+  mkdir -p "$pkgdir/usr/share/acpi_call"
+  cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support
 }
 
-# vim: ts=2 sw=2 et:
+# vim:set ts=2 sw=2 et:

Deleted: acpi_call.install
===================================================================
--- acpi_call.install	2017-11-18 21:21:04 UTC (rev 267368)
+++ acpi_call.install	2017-11-18 23:18:42 UTC (rev 267369)
@@ -1,14 +0,0 @@
-post_install() {
-  _extramodules=extramodules-4.13-ARCH
-  depmod $(cat /usr/lib/modules/${_extramodules}/version)
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim: ts=2 sw=2 et:

Added: dkms.conf
===================================================================
--- dkms.conf	                        (rev 0)
+++ dkms.conf	2017-11-18 23:18:42 UTC (rev 267369)
@@ -0,0 +1,9 @@
+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"