From f44dc6f4eae82c0261866ce083458b3dfaf15e85 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 30 Aug 2024 17:09:00 +0000 Subject: [PATCH 1/2] Fix kernel-tools dependencies --- SPECS/raspberrypi2.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 967d8f0..b78f5d7 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -11,7 +11,7 @@ ExclusiveArch: aarch64 %define local_version v8 %define bcmmodel 2711 -%define extra_version 2 +%define extra_version 3 # This originally implies Kernel 4.x for RPi 2 and is not appropriate now. # Be careful to change this not to disturb the seamless package update. @@ -99,7 +99,8 @@ Provides: cpufrequtils = 1:009-0.6.p1 Obsoletes: cpufreq-utils < 1:009-0.6.p1 Obsoletes: cpufrequtils < 1:009-0.6.p1 Obsoletes: cpuspeed < 1:1.5-16 -Requires: kernel-tools-libs = %{version}-%{release} +Requires: %{name}-kernel%{?ksuffix}-tools-libs = %{version}-%{release} +Provides: kernel-tools = %{version}-%{release} %define __requires_exclude ^%{_bindir}/python %description kernel%{?ksuffix}-tools This package contains the tools/ directory from the kernel source @@ -107,18 +108,18 @@ and the supporting documentation. %package kernel%{?ksuffix}-tools-libs Summary: Libraries for the kernels-tools -Provides: kernel-tools-libs +Provides: kernel-tools-libs = %{version}-%{release} %description kernel%{?ksuffix}-tools-libs This package contains the libraries built from the tools/ directory from the kernel source. %package kernel%{?ksuffix}-tools-libs-devel Summary: Assortment of tools for the Linux kernel -Requires: kernel%{?ksuffix}-tools = %{version}-%{release} +Requires: %{name}-kernel%{?ksuffix}-tools = %{version}-%{release} Provides: cpupowerutils-devel = 1:009-0.6.p1 Obsoletes: cpupowerutils-devel < 1:009-0.6.p1 -Requires: kernel-tools-libs = %{version}-%{release} -Provides: kernel-tools-libs-devel +Requires: %{name}-kernel%{?ksuffix}-tools-libs = %{version}-%{release} +Provides: kernel-tools-libs-devel = %{version}-%{release} %description kernel%{?ksuffix}-tools-libs-devel This package contains the development files for the tools/ directory from the kernel source. @@ -390,8 +391,11 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc %endif %changelog +* Fri Aug 30 2024 Andrew Lukoshko - 6.6.31-20240529.v8.3 +- Fix kernel-tools dependencies + * Thu Jun 20 2024 Koichiro Iwao - 6.6.31-20240529.v8.2 -- Add kernel-tools to optimize CPU clock (cpupower.service) +- Add kernel-tools to optimize CPU clock (cpupower.service) * Mon Jun 10 2024 Koichiro Iwao - 6.6.31-20240529.v8.1 - Update to v6.6.31 stable_20240529 -- 2.43.5 From b4c96c3080bd58d67a3aa7dbf11969e61412f7b9 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Wed, 4 Sep 2024 07:54:53 +0000 Subject: [PATCH 2/2] Add obsoletes for kernel-tools packages --- SPECS/raspberrypi2.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index b78f5d7..05c3829 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -100,6 +100,7 @@ Obsoletes: cpufreq-utils < 1:009-0.6.p1 Obsoletes: cpufrequtils < 1:009-0.6.p1 Obsoletes: cpuspeed < 1:1.5-16 Requires: %{name}-kernel%{?ksuffix}-tools-libs = %{version}-%{release} +Obsoletes: kernel-tools < %{version} Provides: kernel-tools = %{version}-%{release} %define __requires_exclude ^%{_bindir}/python %description kernel%{?ksuffix}-tools @@ -108,6 +109,7 @@ and the supporting documentation. %package kernel%{?ksuffix}-tools-libs Summary: Libraries for the kernels-tools +Obsoletes: kernel-tools-libs < %{version} Provides: kernel-tools-libs = %{version}-%{release} %description kernel%{?ksuffix}-tools-libs This package contains the libraries built from the tools/ directory @@ -119,6 +121,7 @@ Requires: %{name}-kernel%{?ksuffix}-tools = %{version}-%{release} Provides: cpupowerutils-devel = 1:009-0.6.p1 Obsoletes: cpupowerutils-devel < 1:009-0.6.p1 Requires: %{name}-kernel%{?ksuffix}-tools-libs = %{version}-%{release} +Obsoletes: kernel-tools-libs-devel < %{version} Provides: kernel-tools-libs-devel = %{version}-%{release} %description kernel%{?ksuffix}-tools-libs-devel This package contains the development files for the tools/ directory from -- 2.43.5