Date: Thursday, December 10, 2020 @ 07:24:56 Author: alucryd Revision: 772967
archrelease: copy trunk to community-any Added: acpi_call-dkms/repos/community-any/0001-linux-5.6.patch (from rev 772966, acpi_call-dkms/trunk/0001-linux-5.6.patch) acpi_call-dkms/repos/community-any/PKGBUILD (from rev 772966, acpi_call-dkms/trunk/PKGBUILD) acpi_call-dkms/repos/community-any/dkms.conf (from rev 772966, acpi_call-dkms/trunk/dkms.conf) Deleted: acpi_call-dkms/repos/community-any/0001-linux-5.6.patch acpi_call-dkms/repos/community-any/PKGBUILD acpi_call-dkms/repos/community-any/dkms.conf ----------------------+ 0001-linux-5.6.patch | 90 ++++++++++++++++++++++++------------------------- PKGBUILD | 78 ++++++++++++++++++++---------------------- dkms.conf | 18 ++++----- 3 files changed, 92 insertions(+), 94 deletions(-) Deleted: 0001-linux-5.6.patch =================================================================== --- 0001-linux-5.6.patch 2020-12-10 07:24:50 UTC (rev 772966) +++ 0001-linux-5.6.patch 2020-12-10 07:24:56 UTC (rev 772967) @@ -1,45 +0,0 @@ -From 958e38a9ade01c0c2d23c1310399147b014177a0 Mon Sep 17 00:00:00 2001 -From: Victor Michel <vic.michel.git...@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, Copied: acpi_call-dkms/repos/community-any/0001-linux-5.6.patch (from rev 772966, acpi_call-dkms/trunk/0001-linux-5.6.patch) =================================================================== --- 0001-linux-5.6.patch (rev 0) +++ 0001-linux-5.6.patch 2020-12-10 07:24:56 UTC (rev 772967) @@ -0,0 +1,45 @@ +From 958e38a9ade01c0c2d23c1310399147b014177a0 Mon Sep 17 00:00:00 2001 +From: Victor Michel <vic.michel.git...@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-12-10 07:24:50 UTC (rev 772966) +++ PKGBUILD 2020-12-10 07:24:56 UTC (rev 772967) @@ -1,40 +0,0 @@ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: mortzu <m...@mortzu.de> -# Contributor: fnord0 <fno...@riseup.net> - -pkgname=acpi_call-dkms -pkgver=1.2.1 -pkgrel=2 -pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call - module sources' -url=https://github.com/nix-community/acpi_call -arch=(any) -license=(GPL) -depends=(dkms) -makedepends=( - git - linux-headers -) -provides=(acpi_call=${pkgver}-${pkgrel}) -conflicts=(acpi_call) -_tag=3a28aabfa337d59df91cc04c85b250da7f7cadea -source=( - git+https://github.com/nix-community/acpi_call.git#tag=${_tag} - dkms.conf -) -b2sums=('SKIP' - '504da1102e778fe54368e990408dbef02f5b2ce91f683d170f3d6a1a2f9349d00d61dcbddd0262a8dfc958ea0964135ba58d8dd88ac06bd10b5e13b90f11faef') - -pkgver() { - cd acpi_call - - git describe --tags | sed 's/^v//' -} - -package() { - install -Dm 644 acpi_call/{Makefile,acpi_call.c} dkms.conf -t "${pkgdir}"/usr/src/acpi_call-${pkgver} - echo acpi_call | install -Dm 644 /dev/stdin "${pkgdir}"/usr/lib/modules-load.d/acpi_call.conf - install -dm 755 "${pkgdir}"/usr/share/acpi_call - cp -dr --no-preserve=ownership acpi_call/{examples,support} "${pkgdir}"/usr/share/acpi_call/ -} - -# vim: ts=2 sw=2 et: Copied: acpi_call-dkms/repos/community-any/PKGBUILD (from rev 772966, acpi_call-dkms/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-12-10 07:24:56 UTC (rev 772967) @@ -0,0 +1,38 @@ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: mortzu <m...@mortzu.de> +# Contributor: fnord0 <fno...@riseup.net> + +pkgname=acpi_call-dkms +pkgver=1.2.1 +pkgrel=3 +pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call - module sources' +url=https://github.com/nix-community/acpi_call +arch=(any) +license=(GPL) +depends=(dkms) +makedepends=(git) +optdepends=('linux-headers: build for the linux kernel') +provides=(acpi_call=${pkgver}-${pkgrel}) +conflicts=(acpi_call) +_tag=3a28aabfa337d59df91cc04c85b250da7f7cadea +source=( + git+https://github.com/nix-community/acpi_call.git#tag=${_tag} + dkms.conf +) +b2sums=('SKIP' + '504da1102e778fe54368e990408dbef02f5b2ce91f683d170f3d6a1a2f9349d00d61dcbddd0262a8dfc958ea0964135ba58d8dd88ac06bd10b5e13b90f11faef') + +pkgver() { + cd acpi_call + + git describe --tags | sed 's/^v//' +} + +package() { + install -Dm 644 acpi_call/{Makefile,acpi_call.c} dkms.conf -t "${pkgdir}"/usr/src/acpi_call-${pkgver} + echo acpi_call | install -Dm 644 /dev/stdin "${pkgdir}"/usr/lib/modules-load.d/acpi_call.conf + install -dm 755 "${pkgdir}"/usr/share/acpi_call + cp -dr --no-preserve=ownership acpi_call/{examples,support} "${pkgdir}"/usr/share/acpi_call/ +} + +# vim: ts=2 sw=2 et: Deleted: dkms.conf =================================================================== --- dkms.conf 2020-12-10 07:24:50 UTC (rev 772966) +++ dkms.conf 2020-12-10 07:24:56 UTC (rev 772967) @@ -1,9 +0,0 @@ -PACKAGE_NAME="acpi_call" -PACKAGE_VERSION="#MODULE_VERSION#" -AUTOINSTALL="yes" - -MAKE[0]="make KVER=$kernelver" -CLEAN="make clean" - -BUILT_MODULE_NAME[0]="acpi_call" -DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi" Copied: acpi_call-dkms/repos/community-any/dkms.conf (from rev 772966, acpi_call-dkms/trunk/dkms.conf) =================================================================== --- dkms.conf (rev 0) +++ dkms.conf 2020-12-10 07:24:56 UTC (rev 772967) @@ -0,0 +1,9 @@ +PACKAGE_NAME="acpi_call" +PACKAGE_VERSION="#MODULE_VERSION#" +AUTOINSTALL="yes" + +MAKE[0]="make KVER=$kernelver" +CLEAN="make clean" + +BUILT_MODULE_NAME[0]="acpi_call" +DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi"