* [gentoo-commits] repo/gentoo:master commit in: sys-power/acpi_call/, sys-power/acpi_call/files/
@ 2017-07-06 15:53 Christoph Junghans
0 siblings, 0 replies; 5+ messages in thread
From: Christoph Junghans @ 2017-07-06 15:53 UTC (permalink / raw
To: gentoo-commits
commit: efd2ddc8c87dc36f34aed8fa62ea06fe2dc44c5f
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 6 15:52:41 2017 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Thu Jul 6 15:53:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd2ddc8
sys-power/acpi_call: add patch for linux-4.12 (bug #623740)
Package-Manager: Portage-2.3.6, Repoman-2.3.1
sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild | 37 ++++++++++++++++++++++
.../files/acpi_call-1.1.0-linux-4.12.patch | 10 ++++++
sys-power/acpi_call/metadata.xml | 4 ---
3 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild
new file mode 100644
index 00000000000..0bbb196395e
--- /dev/null
+++ b/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod
+
+if [ "${PV}" = "9999" ]; then
+ inherit git-2
+ EGIT_REPO_URI="git://github.com/mkottman/acpi_call.git"
+ KEYWORDS=""
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/mkottman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A kernel module that enables you to call ACPI methods"
+HOMEPAGE="https://github.com/mkottman/acpi_call"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+CONFIG_CHECK="ACPI"
+MODULE_NAMES="acpi_call(misc:${S})"
+BUILD_TARGETS="default"
+
+PATCHES=(
+ "${FILESDIR}/${P}-linux-3.17.patch"
+ "${FILESDIR}/${P}-linux-4.12.patch"
+)
+
+src_compile(){
+ BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+ linux-mod_src_compile
+}
diff --git a/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.12.patch b/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.12.patch
new file mode 100644
index 00000000000..ef9fde9f295
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.12.patch
@@ -0,0 +1,10 @@
+--- acpi_call-1.1.0.orig/acpi_call.c 2017-07-03 22:44:38.111270788 +0200
++++ acpi_call-1.1.0/acpi_call.c 2017-07-03 22:44:31.010270815 +0200
+@@ -6,6 +6,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/slab.h>
+ #include <asm/uaccess.h>
++#include <linux/uaccess.h>
+ #include <linux/acpi.h>
+
+ MODULE_LICENSE("GPL");
diff --git a/sys-power/acpi_call/metadata.xml b/sys-power/acpi_call/metadata.xml
index 4b39ce4f91f..3e6c789e783 100644
--- a/sys-power/acpi_call/metadata.xml
+++ b/sys-power/acpi_call/metadata.xml
@@ -4,10 +4,6 @@
<maintainer type="person">
<email>maksbotan@gentoo.org</email>
</maintainer>
- <maintainer type="person">
- <email>junghans@gentoo.org</email>
- <name>Christoph Junghans</name>
- </maintainer>
<upstream>
<remote-id type="github">mkottman/acpi_call</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/acpi_call/, sys-power/acpi_call/files/
@ 2017-12-19 6:03 Matt Thode
0 siblings, 0 replies; 5+ messages in thread
From: Matt Thode @ 2017-12-19 6:03 UTC (permalink / raw
To: gentoo-commits
commit: 6fdc2df80c7113561a7ef699991f353ab71c139b
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 05:59:14 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 06:03:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fdc2df8
sys-power/acpi_call: fix acpi_call for 4.14 kernels
Package-Manager: Portage-2.3.14, Repoman-2.3.6
sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild | 1 +
sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.14.patch | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild
index 711fd3f5d64..3b3733ffcc8 100644
--- a/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild
@@ -29,6 +29,7 @@ BUILD_TARGETS="default"
PATCHES=(
"${FILESDIR}/${P}-linux-3.17.patch"
"${FILESDIR}/${P}-linux-4.12.patch"
+ "${FILESDIR}/${P}-linux-4.14.patch"
)
src_compile(){
diff --git a/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.14.patch b/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.14.patch
new file mode 100644
index 00000000000..f6956163734
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.14.patch
@@ -0,0 +1,9 @@
+--- acpi_call-1.1.0.orig/acpi_call.c 2017-11-24 22:30:59.000000000 +0100
++++ acpi_call-1.1.0/acpi_call.c 2017-11-24 22:30:01.000000000 +0100
+@@ -5,7 +5,6 @@
+ #include <linux/version.h>
+ #include <linux/proc_fs.h>
+ #include <linux/slab.h>
+-#include <asm/uaccess.h>
+ #include <linux/uaccess.h>
+ #include <linux/acpi.h>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/acpi_call/, sys-power/acpi_call/files/
@ 2018-08-07 22:27 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2018-08-07 22:27 UTC (permalink / raw
To: gentoo-commits
commit: 7c4e5cbe228dd25b6516420cec8b2d874c111146
Author: Henning Schild <henning <AT> hennsch <DOT> de>
AuthorDate: Wed Apr 4 07:02:47 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 21:41:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c4e5cbe
sys-power/acpi_call: version bump to 3.17.
Signed-off-by: Henning Schild <henning <AT> hennsch.de>
sys-power/acpi_call/Manifest | 1 +
sys-power/acpi_call/acpi_call-3.17.ebuild | 37 ++++++++++++++++++++++
.../files/acpi_call-3.17-linux-4.12.patch | 12 +++++++
.../files/acpi_call-3.17-linux-4.14.patch | 14 ++++++++
4 files changed, 64 insertions(+)
diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index ebae8eb1b1c..35e63fbb6c7 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -1 +1,2 @@
DIST acpi_call-1.1.0.tar.gz 10470 BLAKE2B 000c5e6f1eb968bdea3d8dfb6d6bf7b18daffe8baa75ff32e8c6c4b98cafe0a72a67a65a17994a1c8efa16f528bdfbf2b27686a146730c319a5195dfa9ec0d51 SHA512 d5cf13c15f9057e3a27aaacfee6dcdb17b6a79194bdc8fd57b8140c07a532e2e58151bea881aa158c1183ac3bbe89f83fcfc2279ffd9e945a72331b6ddbf2c70
+DIST acpi_call-3.17.tar.gz 10470 BLAKE2B e1a4912f4b92532aa8496e668541975b7e563dfd7613d41f33503d5eecad786b84ba98b205f27c4a4fbd3b37b034a467cf7c9a73f2995539d2117f50751df682 SHA512 39f8f924995ba4e5490e93f03c33db083ced224699b1028102294b2cc99edebd1eea04d33b50beed9dea86939c124682ef8d013c990d5611471b104be3200cb1
diff --git a/sys-power/acpi_call/acpi_call-3.17.ebuild b/sys-power/acpi_call/acpi_call-3.17.ebuild
new file mode 100644
index 00000000000..b0d6197ccff
--- /dev/null
+++ b/sys-power/acpi_call/acpi_call-3.17.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod
+
+HOMEPAGE="https://github.com/teleshoes/acpi_call"
+if [ "${PV}" = "9999" ]; then
+ inherit git-r3
+ EGIT_REPO_URI="${HOMEPAGE}.git"
+ KEYWORDS=""
+else
+ inherit vcs-snapshot
+ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A kernel module that enables you to call ACPI methods"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+CONFIG_CHECK="ACPI"
+MODULE_NAMES="acpi_call(misc:${S})"
+BUILD_TARGETS="default"
+
+PATCHES=(
+ "${FILESDIR}/${P}-linux-4.12.patch"
+ "${FILESDIR}/${P}-linux-4.14.patch"
+)
+
+src_compile(){
+ BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+ linux-mod_src_compile
+}
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch
new file mode 100644
index 00000000000..ac64ba5efaf
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch
@@ -0,0 +1,12 @@
+diff --git a/acpi_call.c b/acpi_call.c
+index 35bfe12..c059511 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -7,6 +7,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/slab.h>
+ #include <asm/uaccess.h>
++#include <linux/uaccess.h>
+
+ MODULE_LICENSE("GPL");
+
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch
new file mode 100644
index 00000000000..ddea4fafc69
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch
@@ -0,0 +1,14 @@
+diff --git a/acpi_call.c b/acpi_call.c
+index c059511..b622bf7 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -6,7 +6,9 @@
+ #include <linux/version.h>
+ #include <linux/proc_fs.h>
+ #include <linux/slab.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ #include <asm/uaccess.h>
++#endif
+ #include <linux/uaccess.h>
+
+ MODULE_LICENSE("GPL");
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/acpi_call/, sys-power/acpi_call/files/
@ 2020-03-08 5:07 Jason A. Donenfeld
0 siblings, 0 replies; 5+ messages in thread
From: Jason A. Donenfeld @ 2020-03-08 5:07 UTC (permalink / raw
To: gentoo-commits
commit: ab39951d4de1e1fb171cd5b01b99a8347b0256b2
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 8 05:06:47 2020 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 8 05:07:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab39951d
sys-power/acpi_call: support kernel 5.6
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
sys-power/acpi_call/acpi_call-3.17.ebuild | 1 +
.../acpi_call/files/acpi_call-3.17-linux-5.6.patch | 36 ++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/sys-power/acpi_call/acpi_call-3.17.ebuild b/sys-power/acpi_call/acpi_call-3.17.ebuild
index 186d45388dc..62437ef1097 100644
--- a/sys-power/acpi_call/acpi_call-3.17.ebuild
+++ b/sys-power/acpi_call/acpi_call-3.17.ebuild
@@ -29,6 +29,7 @@ BUILD_TARGETS="default"
PATCHES=(
"${FILESDIR}/${P}-linux-4.12.patch"
"${FILESDIR}/${P}-linux-4.14.patch"
+ "${FILESDIR}/${P}-linux-5.6.patch"
)
src_compile() {
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch
new file mode 100644
index 00000000000..c05c7e3c337
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch
@@ -0,0 +1,36 @@
+From d128d10c5f1554254ce55f3c79ca08390279d628 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Sun, 8 Mar 2020 13:04:55 +0800
+Subject: [PATCH] Support newer proc_ops interface for 5.6
+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ acpi_call.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index 801798b..65eb344 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -348,11 +348,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 file_operations proc_acpi_operations = {
+ .owner = THIS_MODULE,
+ .read = acpi_proc_read,
+ .write = acpi_proc_write,
+ };
++#else
++static const struct proc_ops proc_acpi_operations = {
++ .proc_read = acpi_proc_read,
++ .proc_write = acpi_proc_write,
++};
++#endif
+
+ #else
+ static int acpi_proc_read(char *page, char **start, off_t off,
+--
+2.25.1
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/acpi_call/, sys-power/acpi_call/files/
@ 2021-07-09 15:38 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2021-07-09 15:38 UTC (permalink / raw
To: gentoo-commits
commit: 88139c57b784ecdc49c0e2936c8a5d001cf1c1c1
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 9 15:36:33 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jul 9 15:36:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88139c57
sys-power/acpi_call: support kernel >=5.13
Closes: https://bugs.gentoo.org/801214
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-power/acpi_call/acpi_call-1.2.1.ebuild | 2 ++
.../files/acpi_call-1.2.1-kernel-5.13.patch | 30 ++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/sys-power/acpi_call/acpi_call-1.2.1.ebuild b/sys-power/acpi_call/acpi_call-1.2.1.ebuild
index 90e2e0158a0..418c4c459de 100644
--- a/sys-power/acpi_call/acpi_call-1.2.1.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.2.1.ebuild
@@ -14,6 +14,8 @@ SLOT="0"
KEYWORDS="amd64"
IUSE="examples"
+PATCHES=( "${FILESDIR}/${P}-kernel-5.13.patch" )
+
BUILD_TARGETS="default"
CONFIG_CHECK="ACPI"
MODULE_NAMES="acpi_call(misc:${S})"
diff --git a/sys-power/acpi_call/files/acpi_call-1.2.1-kernel-5.13.patch b/sys-power/acpi_call/files/acpi_call-1.2.1-kernel-5.13.patch
new file mode 100644
index 00000000000..786e639c03c
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-1.2.1-kernel-5.13.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 = {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-09 15:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-07 22:27 [gentoo-commits] repo/gentoo:master commit in: sys-power/acpi_call/, sys-power/acpi_call/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2021-07-09 15:38 Conrad Kostecki
2020-03-08 5:07 Jason A. Donenfeld
2017-12-19 6:03 Matt Thode
2017-07-06 15:53 Christoph Junghans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox