[arch-commits] Commit in acpi_call-dkms/repos/community-x86_64 (5 files)

Christian Hesse eworm at archlinux.org
Wed Apr 1 10:55:15 UTC 2020


    Date: Wednesday, April 1, 2020 @ 10:55:14
  Author: eworm
Revision: 608739

archrelease: copy trunk to community-x86_64

Added:
  acpi_call-dkms/repos/community-x86_64/0001-linux-5.6.patch
    (from rev 608738, acpi_call-dkms/trunk/0001-linux-5.6.patch)
  acpi_call-dkms/repos/community-x86_64/PKGBUILD
    (from rev 608738, acpi_call-dkms/trunk/PKGBUILD)
  acpi_call-dkms/repos/community-x86_64/dkms.conf
    (from rev 608738, acpi_call-dkms/trunk/dkms.conf)
Deleted:
  acpi_call-dkms/repos/community-x86_64/PKGBUILD
  acpi_call-dkms/repos/community-x86_64/dkms.conf

----------------------+
 0001-linux-5.6.patch |   45 ++++++++++++++++++++++++++
 PKGBUILD             |   83 ++++++++++++++++++++++++-------------------------
 dkms.conf            |   18 +++++-----
 3 files changed, 95 insertions(+), 51 deletions(-)

Copied: acpi_call-dkms/repos/community-x86_64/0001-linux-5.6.patch (from rev 608738, acpi_call-dkms/trunk/0001-linux-5.6.patch)
===================================================================
--- 0001-linux-5.6.patch	                        (rev 0)
+++ 0001-linux-5.6.patch	2020-04-01 10:55:14 UTC (rev 608739)
@@ -0,0 +1,45 @@
+From 958e38a9ade01c0c2d23c1310399147b014177a0 Mon Sep 17 00:00:00 2001
+From: Victor Michel <vic.michel.github at gmail.com>
+Date: Tue, 10 Mar 2020 22:33:31 -0700
+Subject: [PATCH] Use proc_ops instead of file_operations on Linux >= 5.6
+
+The proc_create API is changing in Linux 5.6, update code accordingly
+See https://github.com/torvalds/linux/commit/d56c0d45f0e27f814e87a1676b6bdccccbc252e9
+---
+ acpi_call.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index 3025d97..569c2b6 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -5,8 +5,8 @@
+ #include <linux/version.h>
+ #include <linux/proc_fs.h>
+ #include <linux/slab.h>
+-#include <asm/uaccess.h>
+-#include <acpi/acpi.h>
++#include <linux/acpi.h>
++#include <linux/uaccess.h>
+ 
+ MODULE_LICENSE("GPL");
+ 
+@@ -317,11 +317,18 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
+     return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++static struct proc_ops proc_acpi_operations = {
++        .proc_read     = acpi_proc_read,
++        .proc_write    = acpi_proc_write,
++};
++#else
+ static struct file_operations proc_acpi_operations = {
+         .owner    = THIS_MODULE,
+         .read     = acpi_proc_read,
+         .write    = acpi_proc_write,
+ };
++#endif
+ 
+ #else
+ static int acpi_proc_read(char *page, char **start, off_t off,

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-01 10:55:07 UTC (rev 608738)
+++ PKGBUILD	2020-04-01 10:55:14 UTC (rev 608739)
@@ -1,42 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: mortzu <me at mortzu.de>
-# Contributor: fnord0 <fnord0 at riseup.net>
-
-pkgname=acpi_call-dkms
-pkgver=1.1.0
-pkgrel=286
-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/acpi_call-$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:

Copied: acpi_call-dkms/repos/community-x86_64/PKGBUILD (from rev 608738, acpi_call-dkms/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-01 10:55:14 UTC (rev 608739)
@@ -0,0 +1,41 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: mortzu <me at mortzu.de>
+# Contributor: fnord0 <fnord0 at riseup.net>
+
+pkgname=acpi_call-dkms
+pkgver=1.1.0
+pkgrel=287
+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"
+        '0001-linux-5.6.patch'
+        'dkms.conf')
+sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0'
+            '1f397f087fd96d5286907c90f518bbe68b0d19f83ab30bb124f76a19693a932c'
+            '32e6ea6523b13132c6c7838bba7fbf3d040ba2d35a892c2c356245612720df8a')
+
+prepare() {
+  cd acpi_call-$pkgver
+
+  # Fix build with Linux >= 5.6
+  patch -Np1 < ../0001-linux-5.6.patch
+}
+
+package() {
+  cd acpi_call-$pkgver
+
+  install -Dt "$pkgdir/usr/src/acpi_call-$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:

Deleted: dkms.conf
===================================================================
--- dkms.conf	2020-04-01 10:55:07 UTC (rev 608738)
+++ dkms.conf	2020-04-01 10:55:14 UTC (rev 608739)
@@ -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"

Copied: acpi_call-dkms/repos/community-x86_64/dkms.conf (from rev 608738, acpi_call-dkms/trunk/dkms.conf)
===================================================================
--- dkms.conf	                        (rev 0)
+++ dkms.conf	2020-04-01 10:55:14 UTC (rev 608739)
@@ -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"


More information about the arch-commits mailing list