From 52d54671fbdae1a4a17509d9bbb34d7f46071593 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 3 Apr 2026 14:28:44 -0700 Subject: [PATCH] fix: kmod "common" package dependencies (#11007) * fix: Correct post-install kmod build for hid-tmff2 * fix: Adjust requires of new kmods to depend on the -kmod package and not akmod which can't be satisfied. --- anda/system/hid-fanatecff/dkms/dkms-hid-fanatecff.spec | 1 + anda/system/hid-fanatecff/kmod-common/hid-fanatecff.spec | 2 +- anda/system/hid-tmff2/akmod/hid-tmff2-kmod.spec | 2 +- anda/system/hid-tmff2/dkms/dkms-hid-tmff2.conf | 8 ++++++-- anda/system/new-lg4ff/dkms/dkms-new-lg4ff.spec | 1 + anda/system/new-lg4ff/kmod-common/new-lg4ff.spec | 2 +- anda/system/t150-driver/dkms/dkms-t150-driver.spec | 1 + anda/system/t150-driver/kmod-common/t150-driver.spec | 2 +- anda/system/zenergy/dkms/dkms-zenergy.spec | 1 + anda/system/zenergy/kmod-common/zenergy.spec | 2 +- 10 files changed, 15 insertions(+), 7 deletions(-) diff --git a/anda/system/hid-fanatecff/dkms/dkms-hid-fanatecff.spec b/anda/system/hid-fanatecff/dkms/dkms-hid-fanatecff.spec index 2aad9baa9e..7147d6eac4 100644 --- a/anda/system/hid-fanatecff/dkms/dkms-hid-fanatecff.spec +++ b/anda/system/hid-fanatecff/dkms/dkms-hid-fanatecff.spec @@ -17,6 +17,7 @@ Source2: no-weak-modules.conf Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: dkms Conflicts: akmod-%{modulename} +Provides: %{modulename}-kmod BuildArch: noarch %description diff --git a/anda/system/hid-fanatecff/kmod-common/hid-fanatecff.spec b/anda/system/hid-fanatecff/kmod-common/hid-fanatecff.spec index b36ca019b7..f942ce8d34 100644 --- a/anda/system/hid-fanatecff/kmod-common/hid-fanatecff.spec +++ b/anda/system/hid-fanatecff/kmod-common/hid-fanatecff.spec @@ -10,7 +10,7 @@ Summary: Fanatec force feedback driver common files License: GPL-2.0-only URL: https://github.com/gotzl/%{name} Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz -Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} BuildArch: noarch diff --git a/anda/system/hid-tmff2/akmod/hid-tmff2-kmod.spec b/anda/system/hid-tmff2/akmod/hid-tmff2-kmod.spec index 4c18a8249c..711cd5c37b 100644 --- a/anda/system/hid-tmff2/akmod/hid-tmff2-kmod.spec +++ b/anda/system/hid-tmff2/akmod/hid-tmff2-kmod.spec @@ -49,7 +49,7 @@ done %build for kernel_version in %{?kernel_versions}; do pushd _kmod_build_${kernel_version%%___*}/ - %make_build -C "${kernel_version##*___}" M=$(pwd) modules + %make_build KDIR="${kernel_version##*___}" popd done diff --git a/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.conf b/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.conf index d1e4ac70f8..85e7bab069 100644 --- a/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.conf +++ b/anda/system/hid-tmff2/dkms/dkms-hid-tmff2.conf @@ -6,8 +6,12 @@ MAKE[0]="'make' KDIR=\"$kernel_source_dir\"" CLEAN[0]=true BUILT_MODULE_LOCATION[0]="deps/hid-tminit/" -BUILT_MODULE_NAME[0]="hid-tminit" +BUILT_MODULE_NAME[0]="hid-tminit-new" DEST_MODULE_LOCATION[0]="/extra" -BUILT_MODULE_NAME[1]="hid-tmff-new" +BUILT_MODULE_LOCATION[1]="deps/hid-tminit/" +BUILT_MODULE_NAME[1]="usb-tminit-new" DEST_MODULE_LOCATION[1]="/extra" + +BUILT_MODULE_NAME[2]="hid-tmff-new" +DEST_MODULE_LOCATION[2]="/extra" diff --git a/anda/system/new-lg4ff/dkms/dkms-new-lg4ff.spec b/anda/system/new-lg4ff/dkms/dkms-new-lg4ff.spec index 646a73ac83..5e6ec3c831 100644 --- a/anda/system/new-lg4ff/dkms/dkms-new-lg4ff.spec +++ b/anda/system/new-lg4ff/dkms/dkms-new-lg4ff.spec @@ -17,6 +17,7 @@ Source2: no-weak-modules.conf Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: dkms Conflicts: akmod-%{modulename} +Provides: %{modulename}-kmod BuildArch: noarch %description diff --git a/anda/system/new-lg4ff/kmod-common/new-lg4ff.spec b/anda/system/new-lg4ff/kmod-common/new-lg4ff.spec index c124d05b82..8c9f6daf5e 100644 --- a/anda/system/new-lg4ff/kmod-common/new-lg4ff.spec +++ b/anda/system/new-lg4ff/kmod-common/new-lg4ff.spec @@ -10,7 +10,7 @@ Summary: Logitech force feedback driver common files License: GPL-2.0-only URL: https://github.com/berarma/%{name} Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz -Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} BuildArch: noarch diff --git a/anda/system/t150-driver/dkms/dkms-t150-driver.spec b/anda/system/t150-driver/dkms/dkms-t150-driver.spec index b141a221ba..67c0d054d7 100644 --- a/anda/system/t150-driver/dkms/dkms-t150-driver.spec +++ b/anda/system/t150-driver/dkms/dkms-t150-driver.spec @@ -17,6 +17,7 @@ Source2: no-weak-modules.conf Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: dkms Conflicts: akmod-%{modulename} +Provides: %{modulename}-kmod BuildArch: noarch %description diff --git a/anda/system/t150-driver/kmod-common/t150-driver.spec b/anda/system/t150-driver/kmod-common/t150-driver.spec index 01c2a0b4e8..8696f3cc39 100644 --- a/anda/system/t150-driver/kmod-common/t150-driver.spec +++ b/anda/system/t150-driver/kmod-common/t150-driver.spec @@ -10,7 +10,7 @@ Summary: Thrustmaster T150 steering wheel driver common files License: GPL-2.0-only URL: https://github.com/scarburato/t150_driver Source0: %{url}/archive/%{commit}.tar.gz#/t150_driver-%{shortcommit}.tar.gz -Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} BuildArch: noarch diff --git a/anda/system/zenergy/dkms/dkms-zenergy.spec b/anda/system/zenergy/dkms/dkms-zenergy.spec index 52623400be..d293000702 100644 --- a/anda/system/zenergy/dkms/dkms-zenergy.spec +++ b/anda/system/zenergy/dkms/dkms-zenergy.spec @@ -19,6 +19,7 @@ BuildArch: x86_64 Requires: dkms Requires: help2man Conflicts: akmod-%{modulename} +Provides: %{modulename}-kmod Packager: Cappy Ishihara %description diff --git a/anda/system/zenergy/kmod-common/zenergy.spec b/anda/system/zenergy/kmod-common/zenergy.spec index 76199c991f..a296e0a69f 100644 --- a/anda/system/zenergy/kmod-common/zenergy.spec +++ b/anda/system/zenergy/kmod-common/zenergy.spec @@ -12,7 +12,7 @@ Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz Source1: com.github.zenergy.metainfo.xml BuildRequires: sed BuildRequires: systemd-rpm-macros -Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) +Requires: %{name}-kmod = %{?epoch:%{epoch}:}%{version} Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} BuildArch: noarch Packager: Cappy Ishihara