From 075a74aa6678e74d4e5f169b5efa352d7a0ecc15 Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Sun, 3 May 2026 16:28:43 -0500
Subject: [PATCH] ship our own dkms.conf (#11874) (#11876)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

upstream builds the module inside the source directory,
which prevents it being removed on upgrade/remove.
also prevents build failures due to the patch failing to apply

(cherry picked from commit 3754f601873dc026165b0d5926943a7f44a50067)

Co-authored-by: Luan Vitor Simião Oliveira <luanv.oliveira@outlook.com>
---
 .../dkms/dkms-logitech-rs50-linux-driver.spec   |  9 +++++----
 .../logitech-rs50-linux-driver/dkms/dkms.conf   | 10 ++++++++++
 .../dkms/fix-dkms-conf.patch                    | 17 -----------------
 3 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 anda/system/logitech-rs50-linux-driver/dkms/dkms.conf
 delete mode 100644 anda/system/logitech-rs50-linux-driver/dkms/fix-dkms-conf.patch

diff --git a/anda/system/logitech-rs50-linux-driver/dkms/dkms-logitech-rs50-linux-driver.spec b/anda/system/logitech-rs50-linux-driver/dkms/dkms-logitech-rs50-linux-driver.spec
index a15d3b72db..4f82a94cfe 100644
--- a/anda/system/logitech-rs50-linux-driver/dkms/dkms-logitech-rs50-linux-driver.spec
+++ b/anda/system/logitech-rs50-linux-driver/dkms/dkms-logitech-rs50-linux-driver.spec
@@ -6,12 +6,12 @@
 
 Name:           dkms-%{modulename}
 Version:        1.0^%{commitdate}git.%{shortcommit}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Linux kernel driver for the Logitech RS50 Direct Drive Wheel Base (USB ID 046d:c276)
 License:        GPL-2.0-only
 URL:            https://github.com/mescon/%{modulename}
 Source0:        %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz
-Patch0:         fix-dkms-conf.patch
+Source1:        dkms.conf
 BuildRequires:  sed
 BuildRequires:  systemd-rpm-macros
 Requires:       %{modulename} = %{?epoch:%{epoch}:}%{version}
@@ -27,7 +27,6 @@ Linux kernel driver for the Logitech RS50 Direct Drive Wheel Base (USB ID 046d:c
 This is a patched version of the hid-logitech-hidpp driver that adds RS50 support with force feedback (FF_CONSTANT) and exposes all G Hub settings via sysfs for runtime configuration.
 Note: This driver replaces the in-kernel hid-logitech-hidpp module and continues to support all other Logitech HID++ devices (mice, keyboards, other racing wheels like the G29, G920, G923, etc.).
 
-
 %package       akmod-modules
 Summary:       Modules for Akmods
 Requires:      akmod-%{name}
@@ -40,6 +39,7 @@ Akmods modules for the akmod-%{name} package.
 %autosetup -p1 -n %{modulename}-%{commit}
 pushd mainline
 mkdir build
+cp %{SOURCE1} ./dkms.conf
 sed -i -e 's/__VERSION_STRING/%{version}/g' dkms.conf
 popd
 
@@ -59,8 +59,9 @@ dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || :
 %files
 %{_usrsrc}/%{modulename}-%{version}
 
-
 %changelog
+* Sun May 03 2026 Luan V. <luanv.oliveira@outlook.com> - 1.0^20260502git.7296717-2
+- ship our own dkms.conf, allowing full cleanup on uninstall
 * Fri May 01 2026 Luan V. <luanv.oliveira@outlook.com> - 1.0^20260430git.df7f149-2
 - fix build due to upstream changes
 - resolve spec warnings: add Packager tag, remove autochangelog
diff --git a/anda/system/logitech-rs50-linux-driver/dkms/dkms.conf b/anda/system/logitech-rs50-linux-driver/dkms/dkms.conf
new file mode 100644
index 0000000000..4ba86e19c6
--- /dev/null
+++ b/anda/system/logitech-rs50-linux-driver/dkms/dkms.conf
@@ -0,0 +1,10 @@
+PACKAGE_NAME="logitech-rs50-linux-driver"
+PACKAGE_VERSION="__VERSION_STRING"
+AUTOINSTALL="yes"
+
+MAKE[0]="'make' KVERSION=$kernelver"
+CLEAN="make clean"
+
+BUILT_MODULE_NAME[0]="hid-logitech-hidpp"
+DEST_MODULE_NAME[0]="hid-logitech-hidpp"
+DEST_MODULE_LOCATION[0]="/extra"
diff --git a/anda/system/logitech-rs50-linux-driver/dkms/fix-dkms-conf.patch b/anda/system/logitech-rs50-linux-driver/dkms/fix-dkms-conf.patch
deleted file mode 100644
index 2132dd1091..0000000000
--- a/anda/system/logitech-rs50-linux-driver/dkms/fix-dkms-conf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/mainline/dkms.conf b/mainline/dkms.conf
-index 437e5fd..2c4f3a4 100644
---- a/mainline/dkms.conf
-+++ b/mainline/dkms.conf
-@@ -1,8 +1,8 @@
--PACKAGE_NAME="hid-logitech-hidpp"
--PACKAGE_VERSION="1.0"
-+PACKAGE_NAME="logitech-rs50-linux-driver"
-+PACKAGE_VERSION="__VERSION_STRING"
- MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules"
- CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
- BUILT_MODULE_NAME[0]="hid-logitech-hidpp"
- DEST_MODULE_NAME[0]="hid-logitech-hidpp"
- DEST_MODULE_LOCATION[0]="/updates/dkms"
--AUTOINSTALL="yes"
-\ No newline at end of file
-+AUTOINSTALL="yes"