SPECS/raspberrypi2.spec

@@ -11,7 +11,7 @@ ExclusiveArch: aarch64
 
 %define local_version v8
 %define bcmmodel 2711
-%define extra_version 3
+%define extra_version 2
 
 # 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.
@@ -27,8 +27,6 @@ ExclusiveArch: aarch64
 %define with_tools     %{?_without_tools:     0} %{?!_without_tools:     1}
 # firmware
 %define with_firmware  %{?_without_firmware:  0} %{?!_without_firmware:  1}
-# kernel-headers
-%define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 
 Name:           raspberrypi%{rpisuffix}
 Version:        %{kversion}.%{patchlevel}
@@ -58,9 +56,6 @@ BuildRequires: openssl-devel
 # kernel-tools
 BuildRequires: asciidoc
 %endif
-%if %{with_headers}
-BuildRequires: rsync
-%endif
 
 %description
 Specific kernel and bootcode for Raspberry Pi
@@ -104,9 +99,7 @@ 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: %{name}-kernel%{?ksuffix}-tools-libs = %{version}-%{release}
+Requires: kernel-tools-libs = %{version}-%{release}
-Obsoletes: kernel-tools < %{version}
-Provides: kernel-tools = %{version}-%{release}
 %define __requires_exclude ^%{_bindir}/python
 %description kernel%{?ksuffix}-tools
 This package contains the tools/ directory from the kernel source
@@ -114,20 +107,18 @@ and the supporting documentation.
 
 %package kernel%{?ksuffix}-tools-libs
 Summary: Libraries for the kernels-tools
-Obsoletes: kernel-tools-libs < %{version}
+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: %{name}-kernel%{?ksuffix}-tools = %{version}-%{release}
+Requires: 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}
+Requires: kernel-tools-libs = %{version}-%{release}
-Obsoletes: kernel-tools-libs-devel < %{version}
+Provides: kernel-tools-libs-devel
-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.
@@ -147,20 +138,6 @@ This package contains the GPU firmware for the Raspberry Pi BCM2835 SOC
 including the kernel bootloader.
 %endif
 
-%if %{with_headers}
-%package kernel%{?ksuffix}-headers
-Obsoletes: kernel-headers < %{version}
-Provides: kernel-headers = %{version}-%{release}
-Summary:	Header files for the Linux kernel for use by glibc
-
-%description kernel%{?ksuffix}-headers
-Kernel-cross-headers includes the C header files that specify the interface
-between the Linux kernel and userspace libraries and programs.  The
-header files define structures and constants that are needed for
-building most standard programs and are also needed for rebuilding the
-cross-glibc package.
-%endif
-
 %prep
 %setup -q -n linux-stable_%{version_tag}
 %patch100 -p1
@@ -309,14 +286,6 @@ install -m755 page_owner_sort %{buildroot}%{_bindir}/page_owner_sort
 popd
 %endif
 
-%if %{with_headers}
-%{__make} ARCH=%{Arch} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
-
-find %{buildroot}/usr/include \
-    \( -name .install -o -name .check -o \
-       -name ..install.cmd -o -name ..check.cmd \) -delete
-%endif
-
 %if %{with_tools}
 %post kernel%{?ksuffix}-tools
 %systemd_post cpupower.service
@@ -420,23 +389,9 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 %doc /boot/LICENCE.broadcom
 %endif
 
-%if %{with_headers}
-%files kernel%{?ksuffix}-headers
-/usr/include/*
-%exclude %{_includedir}/cpufreq.h
-%exclude %{_includedir}/internal/
-%exclude %{_includedir}/perf/
-%endif
-
 %changelog
-* Thu Sep 05 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.31-20240529.v8.4
-- Add kernel-headers subpackage
-
-* Fri Aug 30 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 6.6.31-20240529.v8.3
-- Fix kernel-tools dependencies
-
 * Thu Jun 20 2024 Koichiro Iwao <meta@almalinux.org> - 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 <meta@almalinux.org> - 6.6.31-20240529.v8.1
 - Update to v6.6.31 stable_20240529