Date: Saturday, July 17, 2021 @ 21:01:24 Author: eworm Revision: 978426
upgpkg: acpi_call-dkms 1.2.1-5: fix linux 5.13 Modified: acpi_call-dkms/trunk/PKGBUILD Deleted: acpi_call-dkms/trunk/0001-linux-5.6.patch ----------------------+ 0001-linux-5.6.patch | 45 --------------------------------------------- PKGBUILD | 9 ++++++++- 2 files changed, 8 insertions(+), 46 deletions(-) Deleted: 0001-linux-5.6.patch =================================================================== --- 0001-linux-5.6.patch 2021-07-17 20:36:01 UTC (rev 978425) +++ 0001-linux-5.6.patch 2021-07-17 21:01:24 UTC (rev 978426) @@ -1,45 +0,0 @@ -From 958e38a9ade01c0c2d23c1310399147b014177a0 Mon Sep 17 00:00:00 2001 -From: Victor Michel <[email protected]> -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, Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-07-17 20:36:01 UTC (rev 978425) +++ PKGBUILD 2021-07-17 21:01:24 UTC (rev 978426) @@ -4,7 +4,7 @@ pkgname=acpi_call-dkms pkgver=1.2.1 -pkgrel=4 +pkgrel=5 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) @@ -27,6 +27,13 @@ git describe --tags | sed 's/^v//' } +prepare() { + cd acpi_call + + # Fix for 5.13+ kernels + git cherry-pick -n '48011f82726c263f49a2b9ca3d9f674bdb4cfd22' +} + 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
