From aceb4f17bfca187301a754dd8e00533331f91e42 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Thu, 1 Jul 2021 01:08:47 +0300 Subject: [PATCH] Avoid missync between installed kernels and binary modules Imagine that a user installed a kernel. After some time he installed a binary kernel module. During upgrades there will be missync because dnf will keep different versions of kernels and modules via instlalonlypkg() --- kernel.spec | 2 +- macros.ksobirator | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index bf041a9..6f288d5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -32,7 +32,7 @@ %define sublevel 47 # Release number. Increase this before a rebuild. -%define rpmrel 1 +%define rpmrel 2 %define fullrpmrel %{rpmrel} %define rpmtag %{disttag} diff --git a/macros.ksobirator b/macros.ksobirator index 2a78f6f..f9baa63 100644 --- a/macros.ksobirator +++ b/macros.ksobirator @@ -25,6 +25,7 @@ Summary: Binary module %{module_name} for kernel-%{ksob_kernel} \ Group: System/Kernel and hardware \ \ %{-r:Requires: %{-r*}} \ +Requires: %{name}%{_isa} = %{EVRD} \ Provides: installonlypkg(kernel-module) = %{EVRD}.module.%{module_name} \ Obsoletes: kernel-module-%{module_name}-%{flavour}-%{kernelversion}.%{patchlevel}-latest < 5.10.34-2 \ \