update to 5.10.17.1.20210303

remove BCM43430A1.hcd but require recent bluez-firmware
remove brcm43438 and requirement for hciattach-rpi but require pi-bluetooth [release 5.10.17.1.20210303-1mamba;Fri Apr 23 2021]

brcm43438.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Broadcom BCM43438 bluetooth HCI
-ConditionPathIsDirectory=/proc/device-tree/soc/gpio@7e200000/bt_pins
-Before=bluetooth.service
-After=dev-ttyAMA0.device
-
-[Service]
-Type=simple
-ExecStart=/usr/sbin/hciattach-rpi -n /dev/ttyAMA0 bcm43xx 921600 noflow -
-
-[Install]
-WantedBy=multi-user.target

raspberrypi-firmware.spec

@@ -1,37 +1,34 @@
-# the userspace libraries and devel files are now available in source format
+# the userspace libraries and devel files are now available in raspberrypi-userland
-%define include_userspace  0
 %define include_kernel 1
 %define kernelver   %(echo %version | cut -d. -f1-3)
 %define gitdirver %(echo %version | cut -d. -f4-5)
 
 Name:          raspberrypi-firmware
 Epoch:         1
-Version:       5.10.11.1.20210201
+Version:       5.10.17.1.20210303
-Release:       2mamba
+Release:       1mamba
 Summary:       Boot firmware files (except kernel) for the Raspberry Pi
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      Davide Madrisan <davide.madrisan@gmail.com>
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://github.com/raspberrypi/firmware
-Source0:       git://github.com/raspberrypi/firmware.git/%{gitdirver}/firmware-%{version}.tar.bz2
+Source0:       https://github.com/raspberrypi/firmware/archive/refs/tags/%{gitdirver}.tar.gz
+#Source0:       git://github.com/raspberrypi/firmware.git/%{gitdirver}/firmware-%{version}.tar.bz2
 Source1:       raspberrypi-firmware-kernelconf.txt
 Source2:       raspberrypi-firmware-kernelcmdline.txt
 Source10:      raspberrypi-firmware-udev-vchiq-permissions
 Source11:      raspberrypi-firmware-ldconf
-Source12:      brcm43438.service
-Source20:      https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm80211/brcm/brcmfmac43430-sdio.bin
 Source21:      https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm80211/brcm/brcmfmac43430-sdio.txt
 Source22:      LICENSE.brcmfmac
-Source23:      https://github.com/OpenELEC/misc-firmware/raw/master/firmware/brcm/BCM43430A1.hcd
 Source24:      brcmfmac43455-sdio.txt
 License:       GPL, LICENCE.broadcom
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
-Requires:      hciattach-rpi
+Requires:      bluez-firmware >= 1.2.20210423git
+Requires:      pi-bluetooth
 ExclusiveArch: arm aarch64
 %systemd_requires
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 %{summary}.
@@ -48,7 +45,7 @@ Linux kernel v7 and modules for the Raspberry Pi.
 Group:         System/Kernel and Hardware
 Summary:       Linux kernel files for the Raspberry Pi
 Provides:      raspberrypi-kernel = %{?epoch:%epoch:}%{version}-%{release}
-Obsoletes:     raspberrypi-kernel
+Obsoletes:     raspberrypi-kernel < 1:5.10.11.1.20210201
 Provides:      kernel-raspberrypi-modules
 Obsoletes:     kernel-raspberrypi-modules < 1:5.10.11.1.20210201
 Requires:      raspberrypi-firmware = %{?epoch:%epoch:}%{version}-%{release}
@@ -91,35 +88,8 @@ Summary:       Documentation for the Raspberry Pi Linux kernel
 %description -n kernel-raspberrypi-doc
 Documentation for the Raspberry Pi Linux kernel.
 
-%if %include_userspace
-%package -n raspberrypi-libs
-Group:         System/Libraries
-Summary:       Userspace libraries for the Raspberry Pi
-
-%description -n raspberrypi-libs
-This package contains the userspace libraries for the Raspberry Pi.
-Source: https://github.com/raspberrypi/firmware.
-
-%package -n raspberrypi-devel
-Group:         Development/Libraries
-Summary:       Development files for the Raspberry Pi
-Requires:      raspberrypi-libs = %{?epoch:%epoch:}%{version}-%{release}
-
-%description -n raspberrypi-devel
-This package contains libraries and header files for developing applications for the Raspberry Pi.
-Source: https://github.com/raspberrypi/firmware.
-
-%package -n raspberrypi-utils
-Group:         System/Tools
-Summary:       System tools for the Raspberry Pi
-
-%description -n raspberrypi-utils
-This package contains some system tools for the Raspberry Pi.
-Source: https://github.com/raspberrypi/firmware.
-%endif
-
 %prep
-%setup -q -n firmware-%{version}
+%setup -q -n firmware-%{gitdirver}
 %define __os_install_post %{nil}
 
 %install
@@ -128,32 +98,41 @@ Source: https://github.com/raspberrypi/firmware.
 # kernel + kernel modules + firmware
 install -d %{buildroot}/boot
 
+%if %include_kernel
+install -d %{buildroot}/lib/modules
+%ifarch aarch64
+boot_klist="\
+kernel8.img"
+cp -R modules/%{kernelver}-v8+ %{buildroot}/lib/modules/
+%endif
+%ifarch arm
+boot_klist="\
+kernel.img
+kernel7.img
+kernel7l.img"
+cp -R modules/%{kernelver}+ %{buildroot}/lib/modules/
+cp -R modules/%{kernelver}-v7+ %{buildroot}/lib/modules/
+cp -R modules/%{kernelver}-v7l+ %{buildroot}/lib/modules/
+%endif
+
 boot_flist="\
 bootcode.bin 
 fixup*.dat
 bcm*.dtb
-%if %include_kernel
-kernel*.img
-%endif
 LICENCE.broadcom
 start*.elf"
 
-for f in $boot_flist; do 
+for f in $boot_flist $boot_klist; do 
    install -m 644 boot/$f %{buildroot}/boot/
 done
 
 cp -a boot/overlays %{buildroot}/boot/overlays/
 
-%if %include_kernel
-install -d %{buildroot}/lib/modules
-cp -R modules/5.* %{buildroot}/lib/modules/
-
 install -d %{buildroot}%{_datadir}/doc/raspberrypi-kernel
 cp -R documentation/ilcomponents %{buildroot}%{_datadir}/doc/raspberrypi-kernel
 %endif
 
 install -d %{buildroot}/lib/firmware/brcm
-#install -D -m0644 %{SOURCE20} %{buildroot}/lib/firmware/brcm/brcmfmac43430-sdio.bin
 install -D -m0644 %{SOURCE21} %{buildroot}/lib/firmware/brcm/brcmfmac43430-sdio.txt
 install -D -m0644 %{SOURCE22} %{buildroot}/lib/firmware/LICENSE.brcmfmac
 install -D -m0644 %{SOURCE24} %{buildroot}/lib/firmware/brcm/brcmfmac43455-sdio.txt
@@ -161,33 +140,6 @@ install -D -m0644 %{SOURCE24} %{buildroot}/lib/firmware/brcm/brcmfmac43455-sdio.
 install %{S:1} %{buildroot}/boot/config.txt
 install %{S:2} %{buildroot}/boot/cmdline.txt
 
-%if %include_userspace
-# libraries
-install -d %{buildroot}/opt/vc/lib
-cp -R opt/vc/lib %{buildroot}/opt/vc/
-install -d %{buildroot}%{_sysconfdir}/ld.so.conf.d
-install %{S:11} %{buildroot}%{_sysconfdir}/ld.so.conf.d/rpi-vc.conf
-
-# development files
-install -d %{buildroot}/opt/vc/include
-cp -R opt/vc/include %{buildroot}/opt/vc/
-
-# tools
-install -d %{buildroot}/opt/vc/bin
-for f in edidparser tvservice vcdbg vcgencmd vchiq_test; do
-   install -m 755 opt/vc/bin/$f %{buildroot}/opt/vc/bin/$f
-done
-
-# udev rules
-install -d %{buildroot}/lib/udev/rules.d
-install -m 644 %{S:10} \
-   %{buildroot}/lib/udev/rules.d/10-vchiq-permissions.rules
-%endif
-
-# rpi3 bluetooth
-install -D -m0644 %{SOURCE12} %{buildroot}/lib/systemd/system/brcm43438.service
-install -D -m0644 %{SOURCE23} %{buildroot}/lib/firmware/BCM43430A1.hcd
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -226,10 +178,8 @@ install -D -m0644 %{SOURCE23} %{buildroot}/lib/firmware/BCM43430A1.hcd
 %config(noreplace) /boot/config.txt
 %config(noreplace) /boot/cmdline.txt
 /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)
@@ -239,6 +189,7 @@ install -D -m0644 %{SOURCE23} %{buildroot}/lib/firmware/BCM43430A1.hcd
 /boot/overlays/README
 
 %if %include_kernel
+%ifarch arm
 %files -n kernel-raspberrypi
 %defattr(-,root,root)
 /boot/kernel.img
@@ -256,42 +207,27 @@ install -D -m0644 %{SOURCE23} %{buildroot}/lib/firmware/BCM43430A1.hcd
 /boot/kernel7l.img
 %dir /lib/modules/%{kernelver}-v7l+
 /lib/modules/%{kernelver}-v7l+/*
+%endif
 
+%ifarch aarch64
 %files -n kernel-raspberrypi-v8
 %defattr(-,root,root)
 /boot/kernel8.img
 %dir /lib/modules/%{kernelver}-v8+
 /lib/modules/%{kernelver}-v8+/*
+%endif
 
 %files -n kernel-raspberrypi-doc
 %defattr(-,root,root)
 %{_datadir}/doc/raspberrypi-kernel
 %endif
 
-%if %include_userspace
-%post -n raspberrypi-libs -p /sbin/ldconfig
-%postun -n raspberrypi-libs -p /sbin/ldconfig
-
-%files -n raspberrypi-libs
-%defattr(-,root,root)
-/opt/vc/lib
-%{_sysconfdir}/ld.so.conf.d/rpi-vc.conf
-
-%files -n raspberrypi-devel
-%defattr(-,root,root)
-/opt/vc/include
-
-%files -n raspberrypi-utils
-%defattr(-,root,root)
-/lib/udev/rules.d/10-vchiq-permissions.rules
-/opt/vc/bin/edidparser
-/opt/vc/bin/tvservice
-/opt/vc/bin/vcdbg
-/opt/vc/bin/vcgencmd
-/opt/vc/bin/vchiq_test
-%endif
-
 %changelog
+* Fri Apr 23 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.10.17.1.20210303-1mamba
+- update to 5.10.17.1.20210303
+- remove BCM43430A1.hcd but require recent bluez-firmware
+- remove brcm43438 and requirement for hciattach-rpi but require pi-bluetooth
+
 * Wed Mar 03 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.10.11.1.20210201-2mamba
 - fix requirements for raspberrypi-firmware-overlays