mirror of
https://github.com/terrapkg/packages.git
synced 2026-06-27 22:08:27 +00:00
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.
This commit is contained in:
committed by
GitHub
parent
3fb8ff6b77
commit
52d54671fb
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ BuildArch: x86_64
|
||||
Requires: dkms
|
||||
Requires: help2man
|
||||
Conflicts: akmod-%{modulename}
|
||||
Provides: %{modulename}-kmod
|
||||
Packager: Cappy Ishihara <cappy@fyralabs.com>
|
||||
|
||||
%description
|
||||
|
||||
@@ -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 <cappy@fyralabs.com>
|
||||
|
||||
Reference in New Issue
Block a user