Date: Wednesday, February 5, 2020 @ 13:24:25 Author: eworm Revision: 563184
split acpi_call and acpi_call-dkms Added: acpi_call-dkms/ acpi_call-dkms/repos/ acpi_call-dkms/trunk/ acpi_call-dkms/trunk/PKGBUILD acpi_call-dkms/trunk/dkms.conf Modified: acpi_call/trunk/PKGBUILD Deleted: acpi_call/trunk/dkms.conf -----------------------+ -dkms/trunk/PKGBUILD | 42 ++++++++++++++++++++++++++++++++++++ -dkms/trunk/dkms.conf | 9 +++++++ trunk/PKGBUILD | 55 +++++++++++------------------------------------- trunk/dkms.conf | 9 ------- 4 files changed, 64 insertions(+), 51 deletions(-) Modified: trunk/PKGBUILD =================================================================== --- trunk/PKGBUILD 2020-02-05 13:23:59 UTC (rev 563183) +++ trunk/PKGBUILD 2020-02-05 13:24:25 UTC (rev 563184) @@ -2,61 +2,32 @@ # Contributor: mortzu <[email protected]> # Contributor: fnord0 <[email protected]> -pkgbase=acpi_call -pkgname=(acpi_call acpi_call-dkms) +pkgname=acpi_call pkgver=1.1.0 -pkgrel=284 +pkgrel=285 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') license=('GPL') -makedepends=('linux-headers') -source=("acpi_call-${pkgver}.tar.gz::https://github.com/mkottman/acpi_call/archive/v${pkgver}.tar.gz"; - dkms.conf) -sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0' - '32e6ea6523b13132c6c7838bba7fbf3d040ba2d35a892c2c356245612720df8a') +makedepends=('linux-headers' "acpi_call-dkms>=$pkgver") +conflicts=('acpi_call-dkms') -prepare() { - cd $pkgbase-$pkgver - - # Fix build with Linux >= 3.17 - sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c - - # Fix build with Linux >= 4.12 - sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c -} - build() { - cd $pkgbase-$pkgver - make KVERSION="$(</usr/src/linux/version)" -} + _kernver=$(</usr/src/linux/version) -package_acpi_call() { - depends=(linux) - - cd $pkgbase-$pkgver - _extradir="/usr/lib/modules/$(</usr/src/linux/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') - cd $pkgbase-$pkgver - install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile acpi_call.c ../dkms.conf + _kernver=$(</usr/src/linux/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: Deleted: trunk/dkms.conf =================================================================== --- trunk/dkms.conf 2020-02-05 13:23:59 UTC (rev 563183) +++ trunk/dkms.conf 2020-02-05 13:24:25 UTC (rev 563184) @@ -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" Added: -dkms/trunk/PKGBUILD =================================================================== --- -dkms/trunk/PKGBUILD (rev 0) +++ -dkms/trunk/PKGBUILD 2020-02-05 13:24:25 UTC (rev 563184) @@ -0,0 +1,42 @@ +# Maintainer: Maxime Gauduin <[email protected]> +# Contributor: mortzu <[email protected]> +# Contributor: fnord0 <[email protected]> + +pkgname=acpi_call-dkms +pkgver=1.1.0 +pkgrel=285 +pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call - module sources' +url='https://github.com/mkottman/acpi_call' +arch=('x86_64') +license=('GPL') +depends=('dkms') +makedepends=('linux-headers') +provides=("acpi_call=$pkgver-$pkgrel") +conflicts=('acpi_call') +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 + + # Fix build with Linux >= 3.17 + sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c + + # Fix build with Linux >= 4.12 + sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c +} + +package() { + cd acpi_call-$pkgver + + install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m0644 Makefile acpi_call.c ../dkms.conf + + echo acpi_call | install -Dm0644 /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:set ts=2 sw=2 et: Added: -dkms/trunk/dkms.conf =================================================================== --- -dkms/trunk/dkms.conf (rev 0) +++ -dkms/trunk/dkms.conf 2020-02-05 13:24:25 UTC (rev 563184) @@ -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"
