From 0282a519bb6cd98bc1e6e49232e21625ac279343 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Tue, 4 Aug 2020 16:15:10 -0400 Subject: [acpi_call][acpi_call-lts][acpi_call-dkms]: rebuild for current kernels (5.7.10 , 5.4.51) --- libre/acpi_call-dkms/0001-linux-5.6.patch | 45 +++++++++++++++++++++++++++++++ libre/acpi_call-dkms/PKGBUILD | 20 +++++++------- libre/acpi_call-lts/PKGBUILD | 9 +++---- libre/acpi_call/PKGBUILD | 17 +++++++----- libre/tp_smapi/PKGBUILD | 2 +- 5 files changed, 71 insertions(+), 22 deletions(-) create mode 100644 libre/acpi_call-dkms/0001-linux-5.6.patch diff --git a/libre/acpi_call-dkms/0001-linux-5.6.patch b/libre/acpi_call-dkms/0001-linux-5.6.patch new file mode 100644 index 000000000..a662a1a58 --- /dev/null +++ b/libre/acpi_call-dkms/0001-linux-5.6.patch @@ -0,0 +1,45 @@ +From 958e38a9ade01c0c2d23c1310399147b014177a0 Mon Sep 17 00:00:00 2001 +From: Victor Michel +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 + #include + #include +-#include +-#include ++#include ++#include + + 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, diff --git a/libre/acpi_call-dkms/PKGBUILD b/libre/acpi_call-dkms/PKGBUILD index 09beaf24f..a1ec4ff2d 100644 --- a/libre/acpi_call-dkms/PKGBUILD +++ b/libre/acpi_call-dkms/PKGBUILD @@ -5,14 +5,15 @@ # Contributor (Hyperbola): Márcio Silva # Maintainer: Omar Vega Ramos -_basekernel=5.5.13-1 + +_basekernel=5.7.10-1 pkgname=acpi_call-dkms pkgver=1.1.0 -pkgrel=286 +pkgrel=287 pkgrel+=.parabola1.basekernel${_basekernel%-*} pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call - module sources' -pkgdesc+=' (built for the linux-libre kernel package)' +pkgdesc+=' (for linux-libre)' url='https://github.com/mkottman/acpi_call' arch=('x86_64') arch+=('i686') @@ -22,18 +23,19 @@ makedepends=(linux-libre-headers=${_basekernel%-*}) 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-libre >= 3.17-gnu - sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c - - # Fix build with Linux-libre >= 4.12-gnu - sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c + # Fix build with Linux >= 5.6 + # also: Linux-libre >= 3.17-gnu (acpi.h) + # also: Linux-libre >= 4.12-gnu (uaccess.h) + patch -Np1 < ../0001-linux-5.6.patch } package() { @@ -46,5 +48,3 @@ package() { 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: diff --git a/libre/acpi_call-lts/PKGBUILD b/libre/acpi_call-lts/PKGBUILD index 13afc8bd9..16d4a2597 100644 --- a/libre/acpi_call-lts/PKGBUILD +++ b/libre/acpi_call-lts/PKGBUILD @@ -5,14 +5,15 @@ # Contributor (Hyperbola): Márcio Silva # Maintainer: Omar Vega Ramos -_basekernel=5.4.28-1 + +_basekernel=5.4.51-1 pkgname=acpi_call-lts pkgver=1.1.0 -pkgrel=131 +pkgrel=162 pkgrel+=.parabola1.basekernel${_basekernel%-*} pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call' -pkgdesc+=' (built for the linux-libre-lts kernel package)' +pkgdesc+=' (for linux-libre-lts)' url='https://github.com/mkottman/acpi_call' arch=('x86_64') arch+=('i686' 'armv7h') @@ -50,5 +51,3 @@ package() { mkdir -p "$pkgdir/usr/share/$pkgname" cp -t "$pkgdir/usr/share/$pkgname" -dr --no-preserve=ownership examples support } - -# vim:set ts=2 sw=2 et: diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index 0625cb176..dfe92063a 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -5,14 +5,15 @@ # Contributor (Hyperbola): Márcio Silva # Maintainer: Omar Vega Ramos -_basekernel=5.5.13-1 + +_basekernel=5.7.10-1 pkgname=acpi_call pkgver=1.1.0 -pkgrel=301 +pkgrel=336 pkgrel+=.parabola1.basekernel${_basekernel%-*} pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call' -pkgdesc+=' (built for the linux-libre kernel package)' +pkgdesc+=' (for linux-libre)' url='https://github.com/mkottman/acpi_call' arch=('x86_64') arch+=('i686') @@ -21,9 +22,10 @@ makedepends=("linux-libre-headers=${_basekernel%-*}" "acpi_call-dkms=$pkgver") conflicts=('acpi_call-dkms') build() { + _kernver=$(