Use the consistent directory under /usr/share with the package name

Reviewed-on: rpms/raspberrypi2#16

.raspberrypi2.metadata

@@ -1,2 +1,2 @@
-15d20d02cbea3641470b226ae025d8ddbdaf2913  SOURCES/rpi-6.12.y_20241206_2.tar.gz
 3b7015807a4ca000fb448ed13b51d63a5dc7a745  SOURCES/1.20250127.tar.gz
+dff2a82c96972629d33534897d8aa22d8c19ee94  SOURCES/stable_20250127.tar.gz

SPECS/raspberrypi2.spec

@@ -1,5 +1,5 @@
 %global firmware_tag	1.20250127
-%global version_tag	rpi-6.12.y_20241206_2
+%global version_tag	20250127
 
 ExclusiveArch: aarch64
 
@@ -11,21 +11,15 @@ ExclusiveArch: aarch64
 
 %define local_version v8
 %define bcmmodel 2711
-%define extra_version 3
+%define extra_version 1
 
 # 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.
 %define rpisuffix 2
 %define ksuffix 4
 
-%define kversion 6.12
+%define kversion 6.6
-%define patchlevel 1
+%define patchlevel 74
-
-%if 0%{?rhel} >= 10
-%define pathfix %{__python3} %{_rpmconfigdir}/redhat/pathfix.py
-%else
-%define pathfix pathfix.py
-%endif
 
 # standard kernel
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
@@ -38,12 +32,12 @@ ExclusiveArch: aarch64
 
 Name:           raspberrypi%{rpisuffix}
 Version:        %{kversion}.%{patchlevel}
-Release:        20241206.%{local_version}.%{extra_version}%{?dist}
+Release:        %{version_tag}.%{local_version}.%{extra_version}%{?dist}
 Summary:        Specific kernel and bootcode for Raspberry Pi
 
-License:        GPL-2.0 WITH Linux-syscall-note
+License:        GPLv2
 URL:            https://github.com/raspberrypi/linux
-Source0:        https://github.com/raspberrypi/linux/archive/%{version_tag}.tar.gz
+Source0:        https://github.com/raspberrypi/linux/archive/refs/tags/stable_%{version_tag}.tar.gz
 Source1:        https://github.com/raspberrypi/firmware/archive/refs/tags/%{firmware_tag}.tar.gz
 Patch100:       config_2711.patch
 Patch101:       config_2712.patch
@@ -75,9 +69,9 @@ Specific kernel and bootcode for Raspberry Pi
 Group:          System Environment/Kernel
 Summary:        The Linux kernel
 Provides:       kernel = %{version}-%{release}
-Provides:       kernel-core = %{version}-%{release}
 Provides:       installonlypkg(kernel)
 Requires:	coreutils
+
 %description kernel%{?ksuffix}
 The kernel package contains the Linux kernel (vmlinuz), the core of any
 Linux operating system.  The kernel handles the basic functions
@@ -94,52 +88,11 @@ Autoreq:        no
 Requires(pre):  findutils
 Requires:       findutils
 Requires:       perl-interpreter
+
 %description kernel%{?ksuffix}-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
-%package kernel%{?ksuffix}-modules
-Summary:        Pseudo package for kernel modules
-Group:          System Environment/Kernel
-Provides:       installonlypkg(kernel-module)
-Provides:       kernel-modules = %{version}-%{release}
-Provides:       kernel-modules-uname-r = %{version}-%{release}
-Obsoletes:      kernel-modules < %{version}-%{release}
-Requires:       %{name}-kernel%{?ksuffix} = %{version}-%{release}
-AutoReq:        no
-AutoProv:       yes
-%description kernel%{?ksuffix}-modules
-This package provides pseudo dependency for the packages that depends on regular
-kernel-modules packages.
-
-%package kernel%{?ksuffix}-modules-core
-Summary:        Pseudo package for core kernel modules
-Group:          System Environment/Kernel
-Provides:       installonlypkg(kernel-module)
-Provides:       kernel-modules-core = %{version}-%{release}
-Provides:       kernel-modules-core-uname-r = %{version}-%{release}
-Obsoletes:      kernel-modules-core < %{version}-%{release}
-Requires:       %{name}-kernel%{?ksuffix} = %{version}-%{release}
-AutoReq:        no
-AutoProv:       yes
-%description kernel%{?ksuffix}-modules-core
-This package provides pseudo dependency for the packages that depends on regular
-kernel-modules-core packages.
-
-%package kernel%{?ksuffix}-modules-extra
-Summary:        Pseudo package for extra kernel modules
-Group:          System Environment/Kernel
-Provides:       kernel-modules-extra = %{version}-%{release}
-Provides:       kernel-modules-extra-uname-r = %{version}-%{release}
-Provides:       installonlypkg(kernel-module)
-Obsoletes:      kernel-modules-extra < %{version}-%{release}
-Requires:       %{name}-kernel%{?ksuffix} = %{version}-%{release}
-AutoReq:        no
-AutoProv:       yes
-%description kernel%{?ksuffix}-modules-extra
-This package provides pseudo dependency for the packages that depends on regular
-kernel-modules-extra packages.
-
 %if %{with_tools}
 %package kernel%{?ksuffix}-tools
 Summary: Assortment of tools for the Linux kernel
@@ -210,9 +163,9 @@ glibc package.
 %endif
 
 %prep
-%setup -q -n linux-%{version_tag}
+%setup -q -n linux-stable_%{version_tag}
-%patch -P 100 -p1
+%patch100 -p1
-%patch -P 101 -p1
+%patch101 -p1
 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile
 perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm2711_defconfig
 perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm2712_defconfig
@@ -223,9 +176,9 @@ perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/con
 # -p preserves timestamps
 # -n prevents creating ~backup files
 # -i specifies the interpreter for the shebang
-%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" scripts/
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" scripts/
-%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" scripts/diffconfig scripts/bloat-o-meter scripts/show_delta scripts/jobserver-exec
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" scripts/diffconfig scripts/bloat-o-meter scripts/show_delta scripts/jobserver-exec
-%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" tools/ tools/perf/scripts/python/*.py tools/kvm/kvm_stat/kvm_stat scripts/clang-tools/*.py
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" tools/ tools/perf/scripts/python/*.py tools/kvm/kvm_stat/kvm_stat scripts/clang-tools/*.py
 %endif
 
 %build
@@ -258,15 +211,15 @@ popd
 %if %{with_up}
 # kernel
 mkdir -p %{buildroot}/boot/overlays/
-mkdir -p %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+mkdir -p %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
 cp -p -v COPYING %{buildroot}/boot/COPYING.linux-%{kversion}
-cp -p -v arch/%{Arch}/boot/dts/overlays/README %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+cp -p -v arch/%{Arch}/boot/dts/overlays/README %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
 %ifarch aarch64
-cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot
+cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
 %else
-cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot
+cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
 %endif
-cp -p -v arch/%{Arch}/boot/dts/overlays/*.dtb* %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+cp -p -v arch/%{Arch}/boot/dts/overlays/*.dtb* %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
 cp -p -v arch/%{Arch}/boot/%{build_image} %{buildroot}/boot/kernel-%{version}-%{release}.img
 make INSTALL_MOD_PATH=%{buildroot} modules_install
 cat > %{buildroot}/boot/config-kernel-%{version}-%{release}.inc <<__EOF__
@@ -387,12 +340,12 @@ find %{buildroot}/usr/include \
 %files kernel%{?ksuffix}
 %defattr(-,root,root,-)
 /lib/modules/%{version}-%{release}
-/usr/share/%{name}-kernel/%{version}-%{release}
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}
-/usr/share/%{name}-kernel/%{version}-%{release}/boot
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
-/usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb
 /boot/config-%{version}-%{release}
 /boot/overlays/
-/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*
 %attr(0755,root,root) /boot/kernel-%{version}-%{release}.img
 %ghost /boot/initramfs-%{version}-%{release}.img
 /boot/config-kernel-%{version}-%{release}.inc
@@ -405,9 +358,9 @@ if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
     # if we have moved to initramfs
     cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
 fi
-cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb /boot/
+cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb /boot/
-cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
+cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
-cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/README /boot/overlays/
+cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/README /boot/overlays/
 cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc
 
 %postun kernel%{?ksuffix}
@@ -415,27 +368,15 @@ if [ -f /boot/kernel%{armtarget}.img ];then
     #only restore kernel%{armtarget}.img if it exists, we may have moved to initramfs
     cp $(ls -1 /boot/kernel-*-*|sort -V|tail -1) /boot/kernel%{armtarget}.img
 fi
-cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/*.dtb /boot/
+cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/*.dtb /boot/
-cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/*.dtb* /boot/overlays/
+cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/overlays/*.dtb* /boot/overlays/
-cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README /boot/overlays/
+cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/overlays/README /boot/overlays/
 cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 
 
 %files kernel%{?ksuffix}-devel
 %defattr(-,root,root)
 /usr/src/kernels/%{version}-%{release}
-
-%files kernel%{?ksuffix}-modules
-# empty package
-%defattr(-,root,root)
-
-%files kernel%{?ksuffix}-modules-core
-# empty package
-%defattr(-,root,root)
-
-%files kernel%{?ksuffix}-modules-extra
-# empty package
-%defattr(-,root,root)
 %endif
 
 %if %{with_tools}
@@ -489,28 +430,11 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 %endif
 
 %changelog
-* Thu Feb 20 2025 Koichiro Iwao <meta@almalinux.org> - 6.12.1-20241206.v8.3
+* Thu Feb 20 2025 Koichiro Iwao <meta@almalinux.org> - 6.6.74-20250127.v8.1
+- Update kernel to v6.6.74 stable_20250127
 - Update firmware to 1.20250127
-
-* Mon Jan 27 2025 Koichiro Iwao <emta@almalinux.org> - 6.12.1-20241206.v8.2
-- Add pseudo subpackages for kernel modules to resolve dependency issue
-- The main kernel package now provides kernel-core
-- Convert license to SPDX expression 
 - Remove dracut as initramfs is not needed (mentioned in 4.4.21-2)
 
-* Wed Dec 25 2024 Koichiro Iwao <meta@almalinux.org> - 6.12.1-20241206.v8.1
-- Update kernel to v6.12.1 rpi-6.12.y_20241206_2
-- Update firmware to 1.20241126
-
-* Tue Nov 12 2024 Koichiro Iwao <meta@almalinux.org> - 6.12.0-20241111.v8.1
-- Update kernel to v6.12.0-rc7 20241110 bf70ebd2
-
-* Tue Nov 12 2024 Koichiro Iwao <meta@almalinux.org> - 6.11.7-20241110.v8.1
-- Update kernel to v6.11.7 20241110 efda653d
-
-* Fri Nov 08 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.51-20241008.v8.2
-- Fix build for AL10 Kitten
-
 * Mon Oct 21 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.51-20241008.v8.1
 - Update kernel to version v6.6.51 stable_20241008
 - Update firmware to 1.20241008