* [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
@ 2021-07-17 15:06 dkwo
2021-07-17 20:19 ` ericonr
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: dkwo @ 2021-07-17 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
There is a new pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages acpi
https://github.com/void-linux/void-packages/pull/32022
acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
I've tried to update as suggested #31968 , but when I install it fails to add the module
```
[*] Configuring unpacked packages
acpi_call-dkms-1.2.1_1: configuring ...
Failed to add DKMS module: 'acpi_call-1.2.1'...
acpi_call-dkms-1.2.1_1: updated successfully.
```
What should be changed?
Thanks.
A patch file from https://github.com/void-linux/void-packages/pull/32022.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-acpi-32022.patch --]
[-- Type: text/x-diff, Size: 4462 bytes --]
From 956df1a9c756e9f13bacb073dc6c253663f26905 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 17 Jul 2021 17:03:00 +0200
Subject: [PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
---
.../acpi_call-dkms/patches/linux4.12.patch | 11 -------
srcpkgs/acpi_call-dkms/patches/linux5.6.patch | 21 -------------
.../patches/null_pointer_exception.patch | 30 +++++++++++++++++++
srcpkgs/acpi_call-dkms/template | 10 +++----
4 files changed, 35 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux4.12.patch
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux5.6.patch
create mode 100644 srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
diff --git a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch b/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
deleted file mode 100644
index 7164cbe7d553..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acpi_call.c 2017-01-03 17:17:55.000000000 +0000
-+++ b/acpi_call.c 2017-07-15 00:28:28.259960007 +0000
-@@ -7,7 +7,7 @@
- #include <linux/version.h>
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
--#include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
- #include <linux/acpi.h>
- #else
diff --git a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch b/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
deleted file mode 100644
index 5669234a9a9c..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/acpi_call.c 2017-01-03 18:17:55.000000000 +0100
-+++ b/acpi_call.c 2020-03-31 10:35:40.493575868 +0200
-@@ -347,11 +347,18 @@
- 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,
diff --git a/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
new file mode 100644
index 000000000000..786e639c03ca
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
@@ -0,0 +1,30 @@
+From 48011f82726c263f49a2b9ca3d9f674bdb4cfd22 Mon Sep 17 00:00:00 2001
+From: Alexander Wetzel <alexander@wetzel-home.de>
+Date: Thu, 8 Jul 2021 16:37:43 +0200
+Subject: [PATCH] Fix for 5.13+ kernels
+
+Upstream commit d4455faccd6c ('proc: mandate ->proc_lseek
+in "struct proc_ops"') made seek support for proc mandatory.
+
+Not providing it will cause a null pointer exception for kernels
+>=5.13.0
+
+Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
+---
+ acpi_call.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index ebdda25..9fd9886 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -369,6 +369,9 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
+ static struct proc_ops proc_acpi_operations = {
+ .proc_read = acpi_proc_read,
+ .proc_write = acpi_proc_write,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0)
++ .proc_lseek = default_llseek,
++#endif
+ };
+ #else
+ static struct file_operations proc_acpi_operations = {
diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template
index 2a24e481538f..5d9e4e680e0e 100644
--- a/srcpkgs/acpi_call-dkms/template
+++ b/srcpkgs/acpi_call-dkms/template
@@ -1,15 +1,15 @@
# Template file for 'acpi_call-dkms'
pkgname=acpi_call-dkms
-version=1.2.0
-revision=3
+version=1.2.1
+revision=1
archs="i686 x86_64*"
wrksrc=acpi_call-${version}
short_desc="Kernel module allowing calls to ACPI methods through /proc/acpi/call"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
license="GPL-3.0-or-later"
-homepage="https://github.com/damadmai/acpi_call"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=c48a0a8768d657a8da7b59d7dbf6276554313fa6a0cb012fa4cf85a77e55f44b
+homepage="https://github.com/nix-community/acpi_call"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=aa84ac8a209e18ee6de5fa809abd3474fdca67cda3c3256f0650c4fce78d4a0f
dkms_modules="acpi_call ${version}"
depends="dkms"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
@ 2021-07-17 20:19 ` ericonr
2021-07-17 20:19 ` ericonr
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-07-17 20:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#issuecomment-881954963
Comment:
Remove the redirection to NULL in `/usr/libexec/xbps-triggers/dkms`:
```
$DKMS add -m "$1" -v "$2" >/dev/null 2>&1
```
Then install again to see why it fails.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
2021-07-17 20:19 ` ericonr
@ 2021-07-17 20:19 ` ericonr
2021-07-18 10:31 ` dkwo
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-07-17 20:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#issuecomment-881954963
Comment:
Remove the redirection to `/dev/null` in `/usr/libexec/xbps-triggers/dkms`:
```
$DKMS add -m "$1" -v "$2" >/dev/null 2>&1
```
Then install again to see why it fails.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
2021-07-17 20:19 ` ericonr
2021-07-17 20:19 ` ericonr
@ 2021-07-18 10:31 ` dkwo
2021-07-18 10:38 ` dkwo
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-18 10:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 548 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#issuecomment-882034964
Comment:
Here's more data:
```
[*] Configuring unpacked packages
acpi_call-dkms-1.2.1_1: configuring ...
cat: VERSION: No such file or directory
dkms.conf: Error! No 'PACKAGE_VERSION' directive specified.
Error! Bad conf file.
File: /usr/src/acpi_call-1.2.1/dkms.conf
does not represent a valid dkms.conf file.
Failed to add DKMS module: 'acpi_call-1.2.1'...
acpi_call-dkms-1.2.1_1: updated successfully.
```
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (2 preceding siblings ...)
2021-07-18 10:31 ` dkwo
@ 2021-07-18 10:38 ` dkwo
2021-07-18 10:44 ` [PR PATCH] [Updated] " dkwo
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-18 10:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#issuecomment-882035679
Comment:
Should I just put a `dkms.conf` file by hand in /files with 1.2.1 instead of VERSION, or is there a smarter way?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (3 preceding siblings ...)
2021-07-18 10:38 ` dkwo
@ 2021-07-18 10:44 ` dkwo
2021-07-18 10:46 ` dkwo
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-18 10:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages acpi
https://github.com/void-linux/void-packages/pull/32022
acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
I've tried to update as suggested #31968 , but when I install it fails to add the module
```
[*] Configuring unpacked packages
acpi_call-dkms-1.2.1_1: configuring ...
Failed to add DKMS module: 'acpi_call-1.2.1'...
acpi_call-dkms-1.2.1_1: updated successfully.
```
What should be changed?
Thanks.
A patch file from https://github.com/void-linux/void-packages/pull/32022.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-acpi-32022.patch --]
[-- Type: text/x-diff, Size: 5323 bytes --]
From 3eaa56dc7d3eef460ae946e1e012b4bca0cf5f89 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 17 Jul 2021 17:03:00 +0200
Subject: [PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
---
srcpkgs/acpi_call-dkms/files/dkms.conf | 7 +++++
.../acpi_call-dkms/patches/linux4.12.patch | 11 -------
srcpkgs/acpi_call-dkms/patches/linux5.6.patch | 21 -------------
.../patches/null_pointer_exception.patch | 30 +++++++++++++++++++
srcpkgs/acpi_call-dkms/template | 12 ++++----
5 files changed, 43 insertions(+), 38 deletions(-)
create mode 100644 srcpkgs/acpi_call-dkms/files/dkms.conf
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux4.12.patch
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux5.6.patch
create mode 100644 srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
diff --git a/srcpkgs/acpi_call-dkms/files/dkms.conf b/srcpkgs/acpi_call-dkms/files/dkms.conf
new file mode 100644
index 000000000000..8ed22df83e87
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/files/dkms.conf
@@ -0,0 +1,7 @@
+PACKAGE_NAME="acpi_call"
+PACKAGE_VERSION="1.2.1"
+MAKE="KDIR=/lib/modules/${kernelver}/build make"
+CLEAN="make clean"
+BUILT_MODULE_NAME[0]="acpi_call"
+AUTOINSTALL="yes"
+DEST_MODULE_LOCATION[0]="/extra"
diff --git a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch b/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
deleted file mode 100644
index 7164cbe7d553..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acpi_call.c 2017-01-03 17:17:55.000000000 +0000
-+++ b/acpi_call.c 2017-07-15 00:28:28.259960007 +0000
-@@ -7,7 +7,7 @@
- #include <linux/version.h>
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
--#include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
- #include <linux/acpi.h>
- #else
diff --git a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch b/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
deleted file mode 100644
index 5669234a9a9c..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/acpi_call.c 2017-01-03 18:17:55.000000000 +0100
-+++ b/acpi_call.c 2020-03-31 10:35:40.493575868 +0200
-@@ -347,11 +347,18 @@
- 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,
diff --git a/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
new file mode 100644
index 000000000000..786e639c03ca
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
@@ -0,0 +1,30 @@
+From 48011f82726c263f49a2b9ca3d9f674bdb4cfd22 Mon Sep 17 00:00:00 2001
+From: Alexander Wetzel <alexander@wetzel-home.de>
+Date: Thu, 8 Jul 2021 16:37:43 +0200
+Subject: [PATCH] Fix for 5.13+ kernels
+
+Upstream commit d4455faccd6c ('proc: mandate ->proc_lseek
+in "struct proc_ops"') made seek support for proc mandatory.
+
+Not providing it will cause a null pointer exception for kernels
+>=5.13.0
+
+Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
+---
+ acpi_call.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index ebdda25..9fd9886 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -369,6 +369,9 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
+ static struct proc_ops proc_acpi_operations = {
+ .proc_read = acpi_proc_read,
+ .proc_write = acpi_proc_write,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0)
++ .proc_lseek = default_llseek,
++#endif
+ };
+ #else
+ static struct file_operations proc_acpi_operations = {
diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template
index 2a24e481538f..f9b09eac8465 100644
--- a/srcpkgs/acpi_call-dkms/template
+++ b/srcpkgs/acpi_call-dkms/template
@@ -1,15 +1,15 @@
# Template file for 'acpi_call-dkms'
pkgname=acpi_call-dkms
-version=1.2.0
-revision=3
+version=1.2.1
+revision=1
archs="i686 x86_64*"
wrksrc=acpi_call-${version}
short_desc="Kernel module allowing calls to ACPI methods through /proc/acpi/call"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
license="GPL-3.0-or-later"
-homepage="https://github.com/damadmai/acpi_call"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=c48a0a8768d657a8da7b59d7dbf6276554313fa6a0cb012fa4cf85a77e55f44b
+homepage="https://github.com/nix-community/acpi_call"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=aa84ac8a209e18ee6de5fa809abd3474fdca67cda3c3256f0650c4fce78d4a0f
dkms_modules="acpi_call ${version}"
depends="dkms"
@@ -17,7 +17,7 @@ depends="dkms"
do_install() {
vmkdir usr/src/acpi_call-${version}
vcopy Makefile usr/src/acpi_call-${version}
- vcopy dkms.conf usr/src/acpi_call-${version}
+ vcopy ${FILESDIR}/dkms.conf usr/src/acpi_call-${version}
vcopy "*.c" usr/src/acpi_call-${version}
vmkdir usr/share/acpi_call
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (4 preceding siblings ...)
2021-07-18 10:44 ` [PR PATCH] [Updated] " dkwo
@ 2021-07-18 10:46 ` dkwo
2021-07-18 10:48 ` dkwo
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-18 10:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages acpi
https://github.com/void-linux/void-packages/pull/32022
acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
I've tried to update as suggested #31968 , but when I install it fails to add the module
```
[*] Configuring unpacked packages
acpi_call-dkms-1.2.1_1: configuring ...
Failed to add DKMS module: 'acpi_call-1.2.1'...
acpi_call-dkms-1.2.1_1: updated successfully.
```
What should be changed?
Thanks.
A patch file from https://github.com/void-linux/void-packages/pull/32022.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-acpi-32022.patch --]
[-- Type: text/x-diff, Size: 5323 bytes --]
From c2a4ddd795e524973e06f21b5029f0ddaad153f7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 17 Jul 2021 17:03:00 +0200
Subject: [PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
---
srcpkgs/acpi_call-dkms/files/dkms.conf | 7 +++++
.../acpi_call-dkms/patches/linux4.12.patch | 11 -------
srcpkgs/acpi_call-dkms/patches/linux5.6.patch | 21 -------------
.../patches/null_pointer_exception.patch | 30 +++++++++++++++++++
srcpkgs/acpi_call-dkms/template | 12 ++++----
5 files changed, 43 insertions(+), 38 deletions(-)
create mode 100644 srcpkgs/acpi_call-dkms/files/dkms.conf
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux4.12.patch
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux5.6.patch
create mode 100644 srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
diff --git a/srcpkgs/acpi_call-dkms/files/dkms.conf b/srcpkgs/acpi_call-dkms/files/dkms.conf
new file mode 100644
index 000000000000..8ed22df83e87
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/files/dkms.conf
@@ -0,0 +1,7 @@
+PACKAGE_NAME="acpi_call"
+PACKAGE_VERSION="1.2.1"
+MAKE="KDIR=/lib/modules/${kernelver}/build make"
+CLEAN="make clean"
+BUILT_MODULE_NAME[0]="acpi_call"
+AUTOINSTALL="yes"
+DEST_MODULE_LOCATION[0]="/extra"
diff --git a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch b/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
deleted file mode 100644
index 7164cbe7d553..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acpi_call.c 2017-01-03 17:17:55.000000000 +0000
-+++ b/acpi_call.c 2017-07-15 00:28:28.259960007 +0000
-@@ -7,7 +7,7 @@
- #include <linux/version.h>
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
--#include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
- #include <linux/acpi.h>
- #else
diff --git a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch b/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
deleted file mode 100644
index 5669234a9a9c..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/acpi_call.c 2017-01-03 18:17:55.000000000 +0100
-+++ b/acpi_call.c 2020-03-31 10:35:40.493575868 +0200
-@@ -347,11 +347,18 @@
- 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,
diff --git a/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
new file mode 100644
index 000000000000..786e639c03ca
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
@@ -0,0 +1,30 @@
+From 48011f82726c263f49a2b9ca3d9f674bdb4cfd22 Mon Sep 17 00:00:00 2001
+From: Alexander Wetzel <alexander@wetzel-home.de>
+Date: Thu, 8 Jul 2021 16:37:43 +0200
+Subject: [PATCH] Fix for 5.13+ kernels
+
+Upstream commit d4455faccd6c ('proc: mandate ->proc_lseek
+in "struct proc_ops"') made seek support for proc mandatory.
+
+Not providing it will cause a null pointer exception for kernels
+>=5.13.0
+
+Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
+---
+ acpi_call.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index ebdda25..9fd9886 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -369,6 +369,9 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
+ static struct proc_ops proc_acpi_operations = {
+ .proc_read = acpi_proc_read,
+ .proc_write = acpi_proc_write,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0)
++ .proc_lseek = default_llseek,
++#endif
+ };
+ #else
+ static struct file_operations proc_acpi_operations = {
diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template
index 2a24e481538f..f9b09eac8465 100644
--- a/srcpkgs/acpi_call-dkms/template
+++ b/srcpkgs/acpi_call-dkms/template
@@ -1,15 +1,15 @@
# Template file for 'acpi_call-dkms'
pkgname=acpi_call-dkms
-version=1.2.0
-revision=3
+version=1.2.1
+revision=1
archs="i686 x86_64*"
wrksrc=acpi_call-${version}
short_desc="Kernel module allowing calls to ACPI methods through /proc/acpi/call"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
license="GPL-3.0-or-later"
-homepage="https://github.com/damadmai/acpi_call"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=c48a0a8768d657a8da7b59d7dbf6276554313fa6a0cb012fa4cf85a77e55f44b
+homepage="https://github.com/nix-community/acpi_call"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=aa84ac8a209e18ee6de5fa809abd3474fdca67cda3c3256f0650c4fce78d4a0f
dkms_modules="acpi_call ${version}"
depends="dkms"
@@ -17,7 +17,7 @@ depends="dkms"
do_install() {
vmkdir usr/src/acpi_call-${version}
vcopy Makefile usr/src/acpi_call-${version}
- vcopy dkms.conf usr/src/acpi_call-${version}
+ vcopy ${FILESDIR}/dkms.conf usr/src/acpi_call-${version}
vcopy "*.c" usr/src/acpi_call-${version}
vmkdir usr/share/acpi_call
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (5 preceding siblings ...)
2021-07-18 10:46 ` dkwo
@ 2021-07-18 10:48 ` dkwo
2021-07-18 10:49 ` dkwo
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-18 10:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages acpi
https://github.com/void-linux/void-packages/pull/32022
acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
I've tried to update as suggested #31968 , but when I install it fails to add the module
```
[*] Configuring unpacked packages
acpi_call-dkms-1.2.1_1: configuring ...
Failed to add DKMS module: 'acpi_call-1.2.1'...
acpi_call-dkms-1.2.1_1: updated successfully.
```
What should be changed?
Thanks.
A patch file from https://github.com/void-linux/void-packages/pull/32022.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-acpi-32022.patch --]
[-- Type: text/x-diff, Size: 5323 bytes --]
From 0e6c07ec590fcb9b3f04a951ae2dbb18c753ca38 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 17 Jul 2021 17:03:00 +0200
Subject: [PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
---
srcpkgs/acpi_call-dkms/files/dkms.conf | 7 +++++
.../acpi_call-dkms/patches/linux4.12.patch | 11 -------
srcpkgs/acpi_call-dkms/patches/linux5.6.patch | 21 -------------
.../patches/null_pointer_exception.patch | 30 +++++++++++++++++++
srcpkgs/acpi_call-dkms/template | 12 ++++----
5 files changed, 43 insertions(+), 38 deletions(-)
create mode 100644 srcpkgs/acpi_call-dkms/files/dkms.conf
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux4.12.patch
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux5.6.patch
create mode 100644 srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
diff --git a/srcpkgs/acpi_call-dkms/files/dkms.conf b/srcpkgs/acpi_call-dkms/files/dkms.conf
new file mode 100644
index 000000000000..8ed22df83e87
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/files/dkms.conf
@@ -0,0 +1,7 @@
+PACKAGE_NAME="acpi_call"
+PACKAGE_VERSION="1.2.1"
+MAKE="KDIR=/lib/modules/${kernelver}/build make"
+CLEAN="make clean"
+BUILT_MODULE_NAME[0]="acpi_call"
+AUTOINSTALL="yes"
+DEST_MODULE_LOCATION[0]="/extra"
diff --git a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch b/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
deleted file mode 100644
index 7164cbe7d553..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acpi_call.c 2017-01-03 17:17:55.000000000 +0000
-+++ b/acpi_call.c 2017-07-15 00:28:28.259960007 +0000
-@@ -7,7 +7,7 @@
- #include <linux/version.h>
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
--#include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
- #include <linux/acpi.h>
- #else
diff --git a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch b/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
deleted file mode 100644
index 5669234a9a9c..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/acpi_call.c 2017-01-03 18:17:55.000000000 +0100
-+++ b/acpi_call.c 2020-03-31 10:35:40.493575868 +0200
-@@ -347,11 +347,18 @@
- 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,
diff --git a/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
new file mode 100644
index 000000000000..786e639c03ca
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
@@ -0,0 +1,30 @@
+From 48011f82726c263f49a2b9ca3d9f674bdb4cfd22 Mon Sep 17 00:00:00 2001
+From: Alexander Wetzel <alexander@wetzel-home.de>
+Date: Thu, 8 Jul 2021 16:37:43 +0200
+Subject: [PATCH] Fix for 5.13+ kernels
+
+Upstream commit d4455faccd6c ('proc: mandate ->proc_lseek
+in "struct proc_ops"') made seek support for proc mandatory.
+
+Not providing it will cause a null pointer exception for kernels
+>=5.13.0
+
+Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
+---
+ acpi_call.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index ebdda25..9fd9886 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -369,6 +369,9 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
+ static struct proc_ops proc_acpi_operations = {
+ .proc_read = acpi_proc_read,
+ .proc_write = acpi_proc_write,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0)
++ .proc_lseek = default_llseek,
++#endif
+ };
+ #else
+ static struct file_operations proc_acpi_operations = {
diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template
index 2a24e481538f..f9b09eac8465 100644
--- a/srcpkgs/acpi_call-dkms/template
+++ b/srcpkgs/acpi_call-dkms/template
@@ -1,15 +1,15 @@
# Template file for 'acpi_call-dkms'
pkgname=acpi_call-dkms
-version=1.2.0
-revision=3
+version=1.2.1
+revision=1
archs="i686 x86_64*"
wrksrc=acpi_call-${version}
short_desc="Kernel module allowing calls to ACPI methods through /proc/acpi/call"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
license="GPL-3.0-or-later"
-homepage="https://github.com/damadmai/acpi_call"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=c48a0a8768d657a8da7b59d7dbf6276554313fa6a0cb012fa4cf85a77e55f44b
+homepage="https://github.com/nix-community/acpi_call"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=aa84ac8a209e18ee6de5fa809abd3474fdca67cda3c3256f0650c4fce78d4a0f
dkms_modules="acpi_call ${version}"
depends="dkms"
@@ -17,7 +17,7 @@ depends="dkms"
do_install() {
vmkdir usr/src/acpi_call-${version}
vcopy Makefile usr/src/acpi_call-${version}
- vcopy dkms.conf usr/src/acpi_call-${version}
+ vcopy ${FILESDIR}/dkms.conf usr/src/acpi_call-${version}
vcopy "*.c" usr/src/acpi_call-${version}
vmkdir usr/share/acpi_call
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (6 preceding siblings ...)
2021-07-18 10:48 ` dkwo
@ 2021-07-18 10:49 ` dkwo
2021-07-18 21:18 ` ericonr
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-18 10:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#issuecomment-882037022
Comment:
This works for me, but as I said I'm open to smarter solutions :)
I guess failure is related to less, as it builds fine here..
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (7 preceding siblings ...)
2021-07-18 10:49 ` dkwo
@ 2021-07-18 21:18 ` ericonr
2021-07-19 7:36 ` [PR PATCH] [Updated] " dkwo
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-07-18 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#issuecomment-882118012
Comment:
Use https://github.com/nix-community/acpi_call/pull/17 instead of vendoring in the file.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (8 preceding siblings ...)
2021-07-18 21:18 ` ericonr
@ 2021-07-19 7:36 ` dkwo
2021-07-19 7:44 ` dkwo
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-19 7:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages acpi
https://github.com/void-linux/void-packages/pull/32022
acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
I've tried to update as suggested #31968 , but when I install it fails to add the module
```
[*] Configuring unpacked packages
acpi_call-dkms-1.2.1_1: configuring ...
Failed to add DKMS module: 'acpi_call-1.2.1'...
acpi_call-dkms-1.2.1_1: updated successfully.
```
What should be changed?
Thanks.
A patch file from https://github.com/void-linux/void-packages/pull/32022.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-acpi-32022.patch --]
[-- Type: text/x-diff, Size: 7086 bytes --]
From 54c9bcead612f9f7792c9a99b797fd69186ffe40 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 17 Jul 2021 17:03:00 +0200
Subject: [PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
---
.../patches/dkms_conf_from_outside.patch | 69 +++++++++++++++++++
.../acpi_call-dkms/patches/linux4.12.patch | 11 ---
srcpkgs/acpi_call-dkms/patches/linux5.6.patch | 21 ------
.../patches/null_pointer_exception.patch | 30 ++++++++
srcpkgs/acpi_call-dkms/template | 12 ++--
5 files changed, 105 insertions(+), 38 deletions(-)
create mode 100644 srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux4.12.patch
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux5.6.patch
create mode 100644 srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
diff --git a/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch b/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch
new file mode 100644
index 000000000000..5463fd7f8c71
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch
@@ -0,0 +1,69 @@
+From 4b14040db865034eb4aa215efd212307a9c60167 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Sun, 18 Jul 2021 18:16:13 -0300
+Subject: [PATCH] Allow dkms.conf to be used outside of the repository
+
+Add a Makefile target that turns the dkms.conf.in template into a
+dkms.conf file that has all the necessary informantion to be installed
+directly on a system.
+
+All the dkms-* targets need to depend on the dkms.conf file, now.
+---
+ .gitignore | 1 +
+ Makefile | 11 +++++++----
+ dkms.conf => dkms.conf.in | 2 +-
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+ rename dkms.conf => dkms.conf.in (84%)
+
+diff --git a/.gitignore b/.gitignore
+index a73e5d1..9f39b24 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -9,3 +9,4 @@ MANIFEST
+ Module.symvers
+ debian/tmp/*
+ modules.order
++dkms.conf
+diff --git a/Makefile b/Makefile
+index 269b43f..0094f7e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,16 +17,19 @@ load:
+ -/sbin/rmmod acpi_call
+ /sbin/insmod acpi_call.ko
+
+-dkms-add:
++dkms.conf: dkms.conf.in
++ sed "s/@@VERSION@@/$(VERSION)/" $^ > $@
++
++dkms-add: dkms.conf
+ /usr/sbin/dkms add $(CURDIR)
+
+-dkms-build:
++dkms-build: dkms.conf
+ /usr/sbin/dkms build acpi_call/$(VERSION)
+
+-dkms-install:
++dkms-install: dkms.conf
+ /usr/sbin/dkms install acpi_call/$(VERSION)
+
+-dkms-remove:
++dkms-remove: dkms.conf
+ /usr/sbin/dkms remove acpi_call/$(VERSION) --all
+
+ modprobe-install:
+diff --git a/dkms.conf b/dkms.conf.in
+similarity index 84%
+rename from dkms.conf
+rename to dkms.conf.in
+index 780fb50..b927370 100644
+--- a/dkms.conf
++++ b/dkms.conf.in
+@@ -1,5 +1,5 @@
+ PACKAGE_NAME="acpi_call"
+-PACKAGE_VERSION="$(cat VERSION)"
++PACKAGE_VERSION="@@VERSION@@"
+ MAKE="KDIR=/lib/modules/${kernelver}/build make"
+ CLEAN="make clean"
+ BUILT_MODULE_NAME[0]="acpi_call"
+
diff --git a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch b/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
deleted file mode 100644
index 7164cbe7d553..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acpi_call.c 2017-01-03 17:17:55.000000000 +0000
-+++ b/acpi_call.c 2017-07-15 00:28:28.259960007 +0000
-@@ -7,7 +7,7 @@
- #include <linux/version.h>
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
--#include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
- #include <linux/acpi.h>
- #else
diff --git a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch b/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
deleted file mode 100644
index 5669234a9a9c..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/acpi_call.c 2017-01-03 18:17:55.000000000 +0100
-+++ b/acpi_call.c 2020-03-31 10:35:40.493575868 +0200
-@@ -347,11 +347,18 @@
- 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,
diff --git a/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
new file mode 100644
index 000000000000..786e639c03ca
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
@@ -0,0 +1,30 @@
+From 48011f82726c263f49a2b9ca3d9f674bdb4cfd22 Mon Sep 17 00:00:00 2001
+From: Alexander Wetzel <alexander@wetzel-home.de>
+Date: Thu, 8 Jul 2021 16:37:43 +0200
+Subject: [PATCH] Fix for 5.13+ kernels
+
+Upstream commit d4455faccd6c ('proc: mandate ->proc_lseek
+in "struct proc_ops"') made seek support for proc mandatory.
+
+Not providing it will cause a null pointer exception for kernels
+>=5.13.0
+
+Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
+---
+ acpi_call.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index ebdda25..9fd9886 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -369,6 +369,9 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
+ static struct proc_ops proc_acpi_operations = {
+ .proc_read = acpi_proc_read,
+ .proc_write = acpi_proc_write,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0)
++ .proc_lseek = default_llseek,
++#endif
+ };
+ #else
+ static struct file_operations proc_acpi_operations = {
diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template
index 2a24e481538f..5131491e6a90 100644
--- a/srcpkgs/acpi_call-dkms/template
+++ b/srcpkgs/acpi_call-dkms/template
@@ -1,15 +1,15 @@
# Template file for 'acpi_call-dkms'
pkgname=acpi_call-dkms
-version=1.2.0
-revision=3
+version=1.2.1
+revision=1
archs="i686 x86_64*"
wrksrc=acpi_call-${version}
short_desc="Kernel module allowing calls to ACPI methods through /proc/acpi/call"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
license="GPL-3.0-or-later"
-homepage="https://github.com/damadmai/acpi_call"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=c48a0a8768d657a8da7b59d7dbf6276554313fa6a0cb012fa4cf85a77e55f44b
+homepage="https://github.com/nix-community/acpi_call"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=aa84ac8a209e18ee6de5fa809abd3474fdca67cda3c3256f0650c4fce78d4a0f
dkms_modules="acpi_call ${version}"
depends="dkms"
@@ -17,7 +17,7 @@ depends="dkms"
do_install() {
vmkdir usr/src/acpi_call-${version}
vcopy Makefile usr/src/acpi_call-${version}
- vcopy dkms.conf usr/src/acpi_call-${version}
+ vcopy dkms.conf.in usr/src/acpi_call-${version}/dkms.conf
vcopy "*.c" usr/src/acpi_call-${version}
vmkdir usr/share/acpi_call
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (9 preceding siblings ...)
2021-07-19 7:36 ` [PR PATCH] [Updated] " dkwo
@ 2021-07-19 7:44 ` dkwo
2021-07-19 11:31 ` ericonr
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-19 7:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#issuecomment-882321267
Comment:
Thanks. Does it look better now?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (10 preceding siblings ...)
2021-07-19 7:44 ` dkwo
@ 2021-07-19 11:31 ` ericonr
2021-07-19 16:43 ` [PR PATCH] [Updated] " dkwo
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-07-19 11:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#issuecomment-882475095
Comment:
It does, thanks! We can merge once things are back to normal.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (11 preceding siblings ...)
2021-07-19 11:31 ` ericonr
@ 2021-07-19 16:43 ` dkwo
2021-07-22 18:52 ` [PR REVIEW] " ericonr
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-19 16:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages acpi
https://github.com/void-linux/void-packages/pull/32022
acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
I've tried to update as suggested #31968 , but when I install it fails to add the module
```
[*] Configuring unpacked packages
acpi_call-dkms-1.2.1_1: configuring ...
Failed to add DKMS module: 'acpi_call-1.2.1'...
acpi_call-dkms-1.2.1_1: updated successfully.
```
What should be changed?
Thanks.
A patch file from https://github.com/void-linux/void-packages/pull/32022.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-acpi-32022.patch --]
[-- Type: text/x-diff, Size: 7086 bytes --]
From 7b063c1ad8e16f3a1b2a2c8274a488b7abc6c24c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 17 Jul 2021 17:03:00 +0200
Subject: [PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
---
.../patches/dkms_conf_from_outside.patch | 69 +++++++++++++++++++
.../acpi_call-dkms/patches/linux4.12.patch | 11 ---
srcpkgs/acpi_call-dkms/patches/linux5.6.patch | 21 ------
.../patches/null_pointer_exception.patch | 30 ++++++++
srcpkgs/acpi_call-dkms/template | 12 ++--
5 files changed, 105 insertions(+), 38 deletions(-)
create mode 100644 srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux4.12.patch
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux5.6.patch
create mode 100644 srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
diff --git a/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch b/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch
new file mode 100644
index 000000000000..5463fd7f8c71
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch
@@ -0,0 +1,69 @@
+From 4b14040db865034eb4aa215efd212307a9c60167 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Sun, 18 Jul 2021 18:16:13 -0300
+Subject: [PATCH] Allow dkms.conf to be used outside of the repository
+
+Add a Makefile target that turns the dkms.conf.in template into a
+dkms.conf file that has all the necessary informantion to be installed
+directly on a system.
+
+All the dkms-* targets need to depend on the dkms.conf file, now.
+---
+ .gitignore | 1 +
+ Makefile | 11 +++++++----
+ dkms.conf => dkms.conf.in | 2 +-
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+ rename dkms.conf => dkms.conf.in (84%)
+
+diff --git a/.gitignore b/.gitignore
+index a73e5d1..9f39b24 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -9,3 +9,4 @@ MANIFEST
+ Module.symvers
+ debian/tmp/*
+ modules.order
++dkms.conf
+diff --git a/Makefile b/Makefile
+index 269b43f..0094f7e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,16 +17,19 @@ load:
+ -/sbin/rmmod acpi_call
+ /sbin/insmod acpi_call.ko
+
+-dkms-add:
++dkms.conf: dkms.conf.in
++ sed "s/@@VERSION@@/$(VERSION)/" $^ > $@
++
++dkms-add: dkms.conf
+ /usr/sbin/dkms add $(CURDIR)
+
+-dkms-build:
++dkms-build: dkms.conf
+ /usr/sbin/dkms build acpi_call/$(VERSION)
+
+-dkms-install:
++dkms-install: dkms.conf
+ /usr/sbin/dkms install acpi_call/$(VERSION)
+
+-dkms-remove:
++dkms-remove: dkms.conf
+ /usr/sbin/dkms remove acpi_call/$(VERSION) --all
+
+ modprobe-install:
+diff --git a/dkms.conf b/dkms.conf.in
+similarity index 84%
+rename from dkms.conf
+rename to dkms.conf.in
+index 780fb50..b927370 100644
+--- a/dkms.conf
++++ b/dkms.conf.in
+@@ -1,5 +1,5 @@
+ PACKAGE_NAME="acpi_call"
+-PACKAGE_VERSION="$(cat VERSION)"
++PACKAGE_VERSION="@@VERSION@@"
+ MAKE="KDIR=/lib/modules/${kernelver}/build make"
+ CLEAN="make clean"
+ BUILT_MODULE_NAME[0]="acpi_call"
+
diff --git a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch b/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
deleted file mode 100644
index 7164cbe7d553..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acpi_call.c 2017-01-03 17:17:55.000000000 +0000
-+++ b/acpi_call.c 2017-07-15 00:28:28.259960007 +0000
-@@ -7,7 +7,7 @@
- #include <linux/version.h>
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
--#include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
- #include <linux/acpi.h>
- #else
diff --git a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch b/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
deleted file mode 100644
index 5669234a9a9c..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/acpi_call.c 2017-01-03 18:17:55.000000000 +0100
-+++ b/acpi_call.c 2020-03-31 10:35:40.493575868 +0200
-@@ -347,11 +347,18 @@
- 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,
diff --git a/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
new file mode 100644
index 000000000000..786e639c03ca
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
@@ -0,0 +1,30 @@
+From 48011f82726c263f49a2b9ca3d9f674bdb4cfd22 Mon Sep 17 00:00:00 2001
+From: Alexander Wetzel <alexander@wetzel-home.de>
+Date: Thu, 8 Jul 2021 16:37:43 +0200
+Subject: [PATCH] Fix for 5.13+ kernels
+
+Upstream commit d4455faccd6c ('proc: mandate ->proc_lseek
+in "struct proc_ops"') made seek support for proc mandatory.
+
+Not providing it will cause a null pointer exception for kernels
+>=5.13.0
+
+Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
+---
+ acpi_call.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index ebdda25..9fd9886 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -369,6 +369,9 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
+ static struct proc_ops proc_acpi_operations = {
+ .proc_read = acpi_proc_read,
+ .proc_write = acpi_proc_write,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0)
++ .proc_lseek = default_llseek,
++#endif
+ };
+ #else
+ static struct file_operations proc_acpi_operations = {
diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template
index 2a24e481538f..5131491e6a90 100644
--- a/srcpkgs/acpi_call-dkms/template
+++ b/srcpkgs/acpi_call-dkms/template
@@ -1,15 +1,15 @@
# Template file for 'acpi_call-dkms'
pkgname=acpi_call-dkms
-version=1.2.0
-revision=3
+version=1.2.1
+revision=1
archs="i686 x86_64*"
wrksrc=acpi_call-${version}
short_desc="Kernel module allowing calls to ACPI methods through /proc/acpi/call"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
license="GPL-3.0-or-later"
-homepage="https://github.com/damadmai/acpi_call"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=c48a0a8768d657a8da7b59d7dbf6276554313fa6a0cb012fa4cf85a77e55f44b
+homepage="https://github.com/nix-community/acpi_call"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=aa84ac8a209e18ee6de5fa809abd3474fdca67cda3c3256f0650c4fce78d4a0f
dkms_modules="acpi_call ${version}"
depends="dkms"
@@ -17,7 +17,7 @@ depends="dkms"
do_install() {
vmkdir usr/src/acpi_call-${version}
vcopy Makefile usr/src/acpi_call-${version}
- vcopy dkms.conf usr/src/acpi_call-${version}
+ vcopy dkms.conf.in usr/src/acpi_call-${version}/dkms.conf
vcopy "*.c" usr/src/acpi_call-${version}
vmkdir usr/share/acpi_call
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (12 preceding siblings ...)
2021-07-19 16:43 ` [PR PATCH] [Updated] " dkwo
@ 2021-07-22 18:52 ` ericonr
2021-07-22 19:22 ` dkwo
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-07-22 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#discussion_r675081741
Comment:
In `do_build` you should call `make dkms-conf`, so the `dkms.conf` file with a filled version field is generated.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (13 preceding siblings ...)
2021-07-22 18:52 ` [PR REVIEW] " ericonr
@ 2021-07-22 19:22 ` dkwo
2021-07-22 19:23 ` ericonr
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-22 19:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 433 bytes --]
New review comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#discussion_r675100399
Comment:
Sure, but I need a bit more help :)
```
=> acpi_call-dkms-1.2.1_1: running do_build ...
make: *** No rule to make target 'dkms-conf'. Stop.
=> ERROR: acpi_call-dkms-1.2.1_1: do_build: 'make dkms-conf' exited with 2
=> ERROR: in do_build() at srcpkgs/acpi_call-dkms/template:18
```
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (14 preceding siblings ...)
2021-07-22 19:22 ` dkwo
@ 2021-07-22 19:23 ` ericonr
2021-07-22 19:33 ` [PR PATCH] [Updated] " dkwo
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-07-22 19:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#discussion_r675101085
Comment:
Typo! `make dkms.conf` is what I meant.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (15 preceding siblings ...)
2021-07-22 19:23 ` ericonr
@ 2021-07-22 19:33 ` dkwo
2021-07-22 19:34 ` [PR REVIEW] " dkwo
2021-07-23 5:12 ` [PR PATCH] [Merged]: " ericonr
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-22 19:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages acpi
https://github.com/void-linux/void-packages/pull/32022
acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
I've tried to update as suggested #31968 , but when I install it fails to add the module
```
[*] Configuring unpacked packages
acpi_call-dkms-1.2.1_1: configuring ...
Failed to add DKMS module: 'acpi_call-1.2.1'...
acpi_call-dkms-1.2.1_1: updated successfully.
```
What should be changed?
Thanks.
A patch file from https://github.com/void-linux/void-packages/pull/32022.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-acpi-32022.patch --]
[-- Type: text/x-diff, Size: 6910 bytes --]
From c570b4211a57e33daeabc7b78e34daf916bafea0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 17 Jul 2021 17:03:00 +0200
Subject: [PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
---
.../patches/dkms_conf_from_outside.patch | 69 +++++++++++++++++++
.../acpi_call-dkms/patches/linux4.12.patch | 11 ---
srcpkgs/acpi_call-dkms/patches/linux5.6.patch | 21 ------
.../patches/null_pointer_exception.patch | 30 ++++++++
srcpkgs/acpi_call-dkms/template | 14 ++--
5 files changed, 108 insertions(+), 37 deletions(-)
create mode 100644 srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux4.12.patch
delete mode 100644 srcpkgs/acpi_call-dkms/patches/linux5.6.patch
create mode 100644 srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
diff --git a/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch b/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch
new file mode 100644
index 000000000000..5463fd7f8c71
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/patches/dkms_conf_from_outside.patch
@@ -0,0 +1,69 @@
+From 4b14040db865034eb4aa215efd212307a9c60167 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Sun, 18 Jul 2021 18:16:13 -0300
+Subject: [PATCH] Allow dkms.conf to be used outside of the repository
+
+Add a Makefile target that turns the dkms.conf.in template into a
+dkms.conf file that has all the necessary informantion to be installed
+directly on a system.
+
+All the dkms-* targets need to depend on the dkms.conf file, now.
+---
+ .gitignore | 1 +
+ Makefile | 11 +++++++----
+ dkms.conf => dkms.conf.in | 2 +-
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+ rename dkms.conf => dkms.conf.in (84%)
+
+diff --git a/.gitignore b/.gitignore
+index a73e5d1..9f39b24 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -9,3 +9,4 @@ MANIFEST
+ Module.symvers
+ debian/tmp/*
+ modules.order
++dkms.conf
+diff --git a/Makefile b/Makefile
+index 269b43f..0094f7e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,16 +17,19 @@ load:
+ -/sbin/rmmod acpi_call
+ /sbin/insmod acpi_call.ko
+
+-dkms-add:
++dkms.conf: dkms.conf.in
++ sed "s/@@VERSION@@/$(VERSION)/" $^ > $@
++
++dkms-add: dkms.conf
+ /usr/sbin/dkms add $(CURDIR)
+
+-dkms-build:
++dkms-build: dkms.conf
+ /usr/sbin/dkms build acpi_call/$(VERSION)
+
+-dkms-install:
++dkms-install: dkms.conf
+ /usr/sbin/dkms install acpi_call/$(VERSION)
+
+-dkms-remove:
++dkms-remove: dkms.conf
+ /usr/sbin/dkms remove acpi_call/$(VERSION) --all
+
+ modprobe-install:
+diff --git a/dkms.conf b/dkms.conf.in
+similarity index 84%
+rename from dkms.conf
+rename to dkms.conf.in
+index 780fb50..b927370 100644
+--- a/dkms.conf
++++ b/dkms.conf.in
+@@ -1,5 +1,5 @@
+ PACKAGE_NAME="acpi_call"
+-PACKAGE_VERSION="$(cat VERSION)"
++PACKAGE_VERSION="@@VERSION@@"
+ MAKE="KDIR=/lib/modules/${kernelver}/build make"
+ CLEAN="make clean"
+ BUILT_MODULE_NAME[0]="acpi_call"
+
diff --git a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch b/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
deleted file mode 100644
index 7164cbe7d553..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acpi_call.c 2017-01-03 17:17:55.000000000 +0000
-+++ b/acpi_call.c 2017-07-15 00:28:28.259960007 +0000
-@@ -7,7 +7,7 @@
- #include <linux/version.h>
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
--#include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
- #include <linux/acpi.h>
- #else
diff --git a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch b/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
deleted file mode 100644
index 5669234a9a9c..000000000000
--- a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/acpi_call.c 2017-01-03 18:17:55.000000000 +0100
-+++ b/acpi_call.c 2020-03-31 10:35:40.493575868 +0200
-@@ -347,11 +347,18 @@
- 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,
diff --git a/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
new file mode 100644
index 000000000000..786e639c03ca
--- /dev/null
+++ b/srcpkgs/acpi_call-dkms/patches/null_pointer_exception.patch
@@ -0,0 +1,30 @@
+From 48011f82726c263f49a2b9ca3d9f674bdb4cfd22 Mon Sep 17 00:00:00 2001
+From: Alexander Wetzel <alexander@wetzel-home.de>
+Date: Thu, 8 Jul 2021 16:37:43 +0200
+Subject: [PATCH] Fix for 5.13+ kernels
+
+Upstream commit d4455faccd6c ('proc: mandate ->proc_lseek
+in "struct proc_ops"') made seek support for proc mandatory.
+
+Not providing it will cause a null pointer exception for kernels
+>=5.13.0
+
+Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
+---
+ acpi_call.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index ebdda25..9fd9886 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -369,6 +369,9 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
+ static struct proc_ops proc_acpi_operations = {
+ .proc_read = acpi_proc_read,
+ .proc_write = acpi_proc_write,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0)
++ .proc_lseek = default_llseek,
++#endif
+ };
+ #else
+ static struct file_operations proc_acpi_operations = {
diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template
index 2a24e481538f..ae5b9d6564e2 100644
--- a/srcpkgs/acpi_call-dkms/template
+++ b/srcpkgs/acpi_call-dkms/template
@@ -1,19 +1,23 @@
# Template file for 'acpi_call-dkms'
pkgname=acpi_call-dkms
-version=1.2.0
-revision=3
+version=1.2.1
+revision=1
archs="i686 x86_64*"
wrksrc=acpi_call-${version}
short_desc="Kernel module allowing calls to ACPI methods through /proc/acpi/call"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
license="GPL-3.0-or-later"
-homepage="https://github.com/damadmai/acpi_call"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=c48a0a8768d657a8da7b59d7dbf6276554313fa6a0cb012fa4cf85a77e55f44b
+homepage="https://github.com/nix-community/acpi_call"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=aa84ac8a209e18ee6de5fa809abd3474fdca67cda3c3256f0650c4fce78d4a0f
dkms_modules="acpi_call ${version}"
depends="dkms"
+do_build() {
+ make dkms.conf
+}
+
do_install() {
vmkdir usr/src/acpi_call-${version}
vcopy Makefile usr/src/acpi_call-${version}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (16 preceding siblings ...)
2021-07-22 19:33 ` [PR PATCH] [Updated] " dkwo
@ 2021-07-22 19:34 ` dkwo
2021-07-23 5:12 ` [PR PATCH] [Merged]: " ericonr
18 siblings, 0 replies; 20+ messages in thread
From: dkwo @ 2021-07-22 19:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New review comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/32022#discussion_r675107391
Comment:
Thanks.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Merged]: acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
` (17 preceding siblings ...)
2021-07-22 19:34 ` [PR REVIEW] " dkwo
@ 2021-07-23 5:12 ` ericonr
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-07-23 5:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
There's a merged pull request on the void-packages repository
acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13
https://github.com/void-linux/void-packages/pull/32022
Description:
I've tried to update as suggested #31968 , but when I install it fails to add the module
```
[*] Configuring unpacked packages
acpi_call-dkms-1.2.1_1: configuring ...
Failed to add DKMS module: 'acpi_call-1.2.1'...
acpi_call-dkms-1.2.1_1: updated successfully.
```
What should be changed?
Thanks.
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2021-07-23 5:12 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-17 15:06 [PR PATCH] acpi_call-dkms: update to 1.2.1 and patch for kernel 5.13 dkwo
2021-07-17 20:19 ` ericonr
2021-07-17 20:19 ` ericonr
2021-07-18 10:31 ` dkwo
2021-07-18 10:38 ` dkwo
2021-07-18 10:44 ` [PR PATCH] [Updated] " dkwo
2021-07-18 10:46 ` dkwo
2021-07-18 10:48 ` dkwo
2021-07-18 10:49 ` dkwo
2021-07-18 21:18 ` ericonr
2021-07-19 7:36 ` [PR PATCH] [Updated] " dkwo
2021-07-19 7:44 ` dkwo
2021-07-19 11:31 ` ericonr
2021-07-19 16:43 ` [PR PATCH] [Updated] " dkwo
2021-07-22 18:52 ` [PR REVIEW] " ericonr
2021-07-22 19:22 ` dkwo
2021-07-22 19:23 ` ericonr
2021-07-22 19:33 ` [PR PATCH] [Updated] " dkwo
2021-07-22 19:34 ` [PR REVIEW] " dkwo
2021-07-23 5:12 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).