rebuild module packages against linux-libre-4.12.10_gnu-1

4 files changed, 26 insertions, 26 deletions

diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index 15cdcedfa..310aa7103 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -6,11 +6,11 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_kernelname=-lts
+_kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.11
-  _archrel=64
+  _basekernel=4.12
+  _archrel=72
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
@@ -53,6 +53,11 @@ prepare() {
     # Fix build with Linux-libre 3.17-gnu
     sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c
   fi
+
+  if [[ ${_basekernel} > 4.11 ]]; then
+    # Fix build with Linux-libre 4.12-gnu
+    sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c
+  fi
 }
 
 build() {
diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD
index 8abb73a90..6b49e84a1 100644
--- a/libre/bbswitch/PKGBUILD
+++ b/libre/bbswitch/PKGBUILD
@@ -6,12 +6,12 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_kernelname=-lts
+_kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.11
-  _archrel=70
-  _parabolarel=2
+  _basekernel=4.12
+  _archrel=78
+  _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
   _archrel=35
@@ -37,7 +37,7 @@ if [[ ${_kernelname} != "" ]]; then
 fi
 
 source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
-md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
+sha256sums=('76cabd3f734fb4fe6ebfe3ec9814138d0d6f47d47238521ecbd6a986b60d1477')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index 7af2e4ac1..06d1ad33c 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -11,11 +11,11 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_kernelname=-lts
+_kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.11
-  _archrel=19
+  _basekernel=4.12
+  _archrel=28
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9
@@ -48,27 +48,22 @@ fi
 
 install='kmod.install'
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/evgeni/${_pkgname}/archive/${__pkgname}/${pkgver}.tar.gz")
-md5sums=('6a51d3aa459ad7a6ebfbb8c29527b3ee')
+sha256sums=('cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381')
 
 build() {
-  cd "${srcdir}/${_pkgname}-${__pkgname}-${pkgver}"
+  cd "${_pkgname}-${__pkgname}-${pkgver}"
 
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  # https://bugs.archlinux.org/task/54975 (kernel has no _GLOBAL_OFFSET_TABLE_):
+  # Clear EXTRA_CFLAGS since it defaults to injecting CFLAGS and -fno-plt breaks the modules
 
-  make HDAPS=1 KVER="${_kernver}" KBASE="/usr/lib/modules/${_kernver}"
+  make HDAPS=1 KVER="$(</usr/lib/modules/${_extramodules}/version)" EXTRA_CFLAGS=
 }
 
 package() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  cd "${_pkgname}-${__pkgname}-${pkgver}"
 
-  # Actually install
-  make -C "/usr/lib/modules/${_kernver}/build" \
-    INSTALL_MOD_PATH="${pkgdir}/usr" \
-    M="${srcdir}/${_pkgname}-${__pkgname}-${pkgver}" modules_install
-
-  cd "${pkgdir}/usr/lib/modules"
-  mv "${_kernver}/extra" "${_extramodules}"
-  rmdir "${_kernver}"
+  # install kernel modules
+  find . -name "*.ko" -exec install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" {} +
 
   # compress kernel modules
   find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD
index e00826b27..207b3ba16 100644
--- a/libre/vhba-module/PKGBUILD
+++ b/libre/vhba-module/PKGBUILD
@@ -9,8 +9,8 @@
 _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.11
-  _archrel=5
+  _basekernel=4.12
+  _archrel=13
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=4.9