[arch-commits] Commit in bbswitch/trunk (0003-kernel-5.18.patch PKGBUILD)

Jan Steffens heftig at gemini.archlinux.org
Tue May 24 20:44:12 UTC 2022


    Date: Tuesday, May 24, 2022 @ 20:44:12
  Author: heftig
Revision: 1210253

Add patch for Linux 5.18

Added:
  bbswitch/trunk/0003-kernel-5.18.patch
Modified:
  bbswitch/trunk/PKGBUILD

------------------------+
 0003-kernel-5.18.patch |   19 +++++++++++++++++++
 PKGBUILD               |    6 ++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

Added: 0003-kernel-5.18.patch
===================================================================
--- 0003-kernel-5.18.patch	                        (rev 0)
+++ 0003-kernel-5.18.patch	2022-05-24 20:44:12 UTC (rev 1210253)
@@ -0,0 +1,19 @@
+diff -u -r bbswitch-0.8/bbswitch.c bbswitch-0.8-5.18/bbswitch.c
+--- bbswitch-0.8/bbswitch.c	2022-05-24 20:26:22.184553495 +0000
++++ bbswitch-0.8-5.18/bbswitch.c	2022-05-24 20:29:00.797008130 +0000
+@@ -264,10 +264,15 @@
+     pci_disable_device(dis_dev);
+     do {
+         struct acpi_device *ad = NULL;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++        ad = acpi_fetch_acpi_dev(dis_handle);
++        if (!ad) {
++#else
+         int r;
+ 
+         r = acpi_bus_get_device(dis_handle, &ad);
+         if (r || !ad) {
++#endif
+             pr_warn("Cannot get ACPI device for PCI device\n");
+             break;
+         }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-24 20:37:41 UTC (rev 1210252)
+++ PKGBUILD	2022-05-24 20:44:12 UTC (rev 1210253)
@@ -12,15 +12,17 @@
 license=('GPL')
 makedepends=('linux-headers')
 source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz"
-        0001-proc_ops-struct.patch 0002-kernel-5.7.patch)
+        0001-proc_ops-struct.patch 0002-kernel-5.7.patch 0003-kernel-5.18.patch)
 sha512sums=('11ab163931feb6c0e202d04c4552b848e999fedea9990390c26b28abdb4a69081ccfb5a22d1e390cc274f1c0cfc9adedc719c5fece14738b17aaa93e28865b7c'
             '993a2895c37ea213c105be668f794af54838d8015d6f561ee6bc7ce65583425515931c83c2487ab97c14454105f233f089e8bdc90ea5ed9576be767335f57ad1'
-            '2eeae463b2f83e7744ff1a769cb6186389e026fc78668e836525dfd16a56abfae01cfb150c9bb46af74ec42e87ebea91636118fe0c773e7eaa7ea671b25d2e04')
+            '2eeae463b2f83e7744ff1a769cb6186389e026fc78668e836525dfd16a56abfae01cfb150c9bb46af74ec42e87ebea91636118fe0c773e7eaa7ea671b25d2e04'
+            'c658e0e8de95c678d1a3ea5659344fff9fce14a93e0f8da3f21f79dc9c820feb3c540e1892ffc10a444c96a768d6d3fecd684315988da5f401f5c6ef6f37be79')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
   patch -Np1 < ../0001-proc_ops-struct.patch
   patch -Np1 < ../0002-kernel-5.7.patch
+  patch -Np1 < ../0003-kernel-5.18.patch
 }
 
 build() {



More information about the arch-commits mailing list