fix requirements for raspberrypi-firmware-overlays [release 5.10.11.1.20210201-2mamba;Wed Mar 03 2021]

raspberrypi-firmware.spec

@@ -1,12 +1,13 @@
 # the userspace libraries and devel files are now available in source format
 %define include_userspace  0
 %define include_kernel 1
-%define gitdirver %(echo %version | cut -d. -f3-4)
+%define kernelver   %(echo %version | cut -d. -f1-3)
+%define gitdirver %(echo %version | cut -d. -f4-5)
 
 Name:          raspberrypi-firmware
 Epoch:         1
-Version:       5.4.1.20200902
+Version:       5.10.11.1.20210201
-Release:       1mamba
+Release:       2mamba
 Summary:       Boot firmware files (except kernel) for the Raspberry Pi
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -14,7 +15,6 @@ Distribution:  openmamba
 Packager:      Davide Madrisan <davide.madrisan@gmail.com>
 URL:           https://github.com/raspberrypi/firmware
 Source0:       git://github.com/raspberrypi/firmware.git/%{gitdirver}/firmware-%{version}.tar.bz2
-#Source0:       git://github.com/raspberrypi/firmware.git/master/firmware-%{version}.tar.bz2
 Source1:       raspberrypi-firmware-kernelconf.txt
 Source2:       raspberrypi-firmware-kernelcmdline.txt
 Source10:      raspberrypi-firmware-udev-vchiq-permissions
@@ -36,38 +36,60 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 %description
 %{summary}.
 
+%package overlays
+Group:         System/Kernel and Hardware
+Summary:       Raspberry Pi firmware kernel overlays
+Requires:      raspberrypi-firmware = %{?epoch:%epoch:}%{version}-%{release}
+
+%description overlays
+Linux kernel v7 and modules for the Raspberry Pi.
+
 %package -n kernel-raspberrypi
 Group:         System/Kernel and Hardware
 Summary:       Linux kernel files for the Raspberry Pi
 Provides:      raspberrypi-kernel = %{?epoch:%epoch:}%{version}-%{release}
 Obsoletes:     raspberrypi-kernel
-Requires:      kernel-raspberrypi-modules = %{?epoch:%epoch:}%{version}-%{release}
+Provides:      kernel-raspberrypi-modules
+Obsoletes:     kernel-raspberrypi-modules < 1:5.10.11.1.20210201
 Requires:      raspberrypi-firmware = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      raspberrypi-firmware-overlays = %{?epoch:%epoch:}%{version}-%{release}
 
 %description -n kernel-raspberrypi
 Linux kernel files and modules for the Raspberry Pi.
-Source: https://github.com/raspberrypi/firmware.
 
-*start.elf, bootcode.bin and loader.bin are the GPU firmware and bootloaders.
+%package -n kernel-raspberrypi-v7
-Their licence is described in 'LICENCE.broadcom'.
-The kernel.img files are builds of the Linux kernel, released under the GPL (see COPYING.linux).
-
-%package -n kernel-raspberrypi-modules
 Group:         System/Kernel and Hardware
-Summary:       Linux kernel modules for the Raspberry Pi
+Summary:       Linux kernel v7 and modules for the Raspberry Pi
+Requires:      raspberrypi-firmware = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      raspberrypi-firmware-overlays = %{?epoch:%epoch:}%{version}-%{release}
 
-%description -n kernel-raspberrypi-modules
+%description -n kernel-raspberrypi-v7
-Linux kernel modules for the Raspberry Pi.
+Linux kernel v7 and modules for the Raspberry Pi.
-Source: https://github.com/raspberrypi/firmware.
+
+%package -n kernel-raspberrypi-v7l
+Group:         System/Kernel and Hardware
+Summary:       Linux kernel v7l and modules for the Raspberry Pi
+Requires:      raspberrypi-firmware = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      raspberrypi-firmware-overlays = %{?epoch:%epoch:}%{version}-%{release}
+
+%description -n kernel-raspberrypi-v7l
+Linux kernel v7l and modules for the Raspberry Pi.
+
+%package -n kernel-raspberrypi-v8
+Group:         System/Kernel and Hardware
+Summary:       Linux kernel v8 and modules for the Raspberry Pi
+Requires:      raspberrypi-firmware = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      raspberrypi-firmware-overlays = %{?epoch:%epoch:}%{version}-%{release}
+
+%description -n kernel-raspberrypi-v8
+Linux kernel v8 and modules for the Raspberry Pi.
 
 %package -n kernel-raspberrypi-doc
 Group:         Documentation
-Summary:       Raspberry Pi kernel documentation
+Summary:       Documentation for the Raspberry Pi Linux kernel
-Provides:      raspberrypi-kernel-doc = %{?epoch:%epoch:}%{version}-%{release}
-Obsoletes:     raspberrypi-kernel-doc
 
 %description -n kernel-raspberrypi-doc
-Raspberry Pi kernel documentation.
+Documentation for the Raspberry Pi Linux kernel.
 
 %if %include_userspace
 %package -n raspberrypi-libs
@@ -199,27 +221,47 @@ install -D -m0644 %{SOURCE23} %{buildroot}/lib/firmware/BCM43430A1.hcd
 /boot/bcm2710-rpi-3-b-plus.dtb
 /boot/bcm2711-rpi-4-b.dtb
 /boot/bcm2710-rpi-cm3.dtb
+/boot/bcm2711-rpi-400.dtb
 /boot/LICENCE.broadcom
 %config(noreplace) /boot/config.txt
 %config(noreplace) /boot/cmdline.txt
-%dir /boot/overlays
-/boot/overlays/*.dtbo
-/boot/overlays/overlay_map.dtb
-/boot/overlays/README
 /lib/firmware/LICENSE.brcmfmac
 /lib/firmware/BCM43430A1.hcd
 /lib/firmware/brcm/brcmfmac43430-sdio.txt
 /lib/firmware/brcm/brcmfmac43455-sdio.txt
 /lib/systemd/system/brcm43438.service
 
+%files overlays
+%defattr(-,root,root)
+%dir /boot/overlays
+/boot/overlays/*.dtbo
+/boot/overlays/overlay_map.dtb
+/boot/overlays/README
+
 %if %include_kernel
 %files -n kernel-raspberrypi
 %defattr(-,root,root)
-/boot/kernel*.img
+/boot/kernel.img
+%dir /lib/modules/%{kernelver}+
+/lib/modules/%{kernelver}+/*
 
-%files -n kernel-raspberrypi-modules 
+%files -n kernel-raspberrypi-v7
 %defattr(-,root,root)
-/lib/modules
+/boot/kernel7.img
+%dir /lib/modules/%{kernelver}-v7+
+/lib/modules/%{kernelver}-v7+/*
+
+%files -n kernel-raspberrypi-v7l
+%defattr(-,root,root)
+/boot/kernel7l.img
+%dir /lib/modules/%{kernelver}-v7l+
+/lib/modules/%{kernelver}-v7l+/*
+
+%files -n kernel-raspberrypi-v8
+%defattr(-,root,root)
+/boot/kernel8.img
+%dir /lib/modules/%{kernelver}-v8+
+/lib/modules/%{kernelver}-v8+/*
 
 %files -n kernel-raspberrypi-doc
 %defattr(-,root,root)
@@ -250,6 +292,15 @@ install -D -m0644 %{SOURCE23} %{buildroot}/lib/firmware/BCM43430A1.hcd
 %endif
 
 %changelog
+* Wed Mar 03 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.10.11.1.20210201-2mamba
+- fix requirements for raspberrypi-firmware-overlays
+
+* Wed Mar 03 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.10.11.1.20210201-1mamba
+- update to 5.10.11.1.20210201
+
+* Tue Nov 24 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 5.4.72.1.20201022-1mamba
+- update to 5.4.72.1.20201022
+
 * Thu Oct 01 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 5.4.1.20200902-1mamba
 - update to 5.4.1.20200902