fix: rpi-utils (#2650)

* fix: rpi-utils

* add patch to install dtoverlay manpage

* fix manpage filepaths

* fix otpset package requires

* add patch to exclude overlaycheck-exclude.txt from install to bindir

* add missing vcgencmd bash completion to %files

* Revert "add patch to exclude overlaycheck-exclude.txt from install to bindir"

This reverts commit 5530cda.

* don't package raspinfo and ignore unpackaged files build error

* add main package requires

anda/tools/rpi-utils/dtoverlay-manpage.patch

@@ -0,0 +1,12 @@
+diff --git a/dtmerge/CMakeLists.txt b/dtmerge/CMakeLists.txt
+index 7e2702e..9b101c4 100644
+--- a/dtmerge/CMakeLists.txt
++++ b/dtmerge/CMakeLists.txt
+@@ -23,6 +23,7 @@ add_executable(dtoverlay dtoverlay_main.c utils.c)
+ target_link_libraries(dtoverlay dtovl)
+ install(TARGETS dtoverlay RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(FILES dtoverlay.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
++install(FILES dtoverlay.2 DESTINATION ${CMAKE_INSTALL_MANDIR}/man2)
+
+ add_custom_command(TARGET dtoverlay POST_BUILD COMMAND ln;-sf;dtoverlay;dtparam)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION ${CMAKE_INSTALL_BINDIR})

anda/tools/rpi-utils/rpi-utils.spec

@@ -1,84 +1,181 @@
 %global commit 9d884c7ed214cc6aad5f498b53a1253e177239fd
 %global commit_date 20241213
-%global shortcommit %(c=%{commit}; echo ${C:0:7})
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+%define _unpackaged_files_terminate_build 0
 
 Name:			rpi-utils
-Version:		%commit_date.%shortcommit
-Release:		1%?dist
+Version:		%{commit_date}.%{shortcommit}
+Release:		1%{?dist}
 Summary:		A collection of scripts and simple applications for Raspberry Pi devices
-License:		BSD
+License:		BSD-3-Clause
 URL:			https://github.com/raspberrypi/utils
-Source0:		%url/archive/%commit/utils-%commit.tar.gz
+Source0:		%{url}/archive/%{commit}.tar.gz
+Patch0:         dtoverlay-manpage.patch
 # BuildArch:      noarch
-BuildRequires:	cmake dtc libfdt-devel g++
+BuildRequires:	cmake dtc libfdt-devel gcc-c++
+
+Requires:       %{name}-dtmerge
+Requires:       %{name}-eeptools
+Requires:       %{name}-kdtc
+Requires:       %{name}-otpset
+Requires:       %{name}-overlaycheck
+Requires:       %{name}-ovmerge
+Requires:       %{name}-pinctrl
+Requires:       %{name}-piolib
+Requires:       %{name}-vcgencmd
+Requires:       %{name}-vclog
+Requires:       %{name}-vcmailbox
 
 %description
-dtmerge - A tool for applying compiled DT overlays (*.dtbo) to base Device Tree files (*.dtb). Also includes the dtoverlay and dtparam utilities.
-eeptools - Tools for creating and managing EEPROMs for HAT+ and HAT board.
-kdtc - A tool for compiling overlays with #includes, etc., as used in the kernel tree.
-otpset - A short script to help with reading and setting the customer OTP bits.
-overlaycheck - A tool for validating the overlay files and README in a kernel source tree.
-ovmerge - A tool for merging DT overlay source files (*-overlay.dts), flattening and sorting .dts files for easy comparison, displaying the include tree, etc.
-pinctrl - A more powerful replacement for raspi-gpio, a tool for displaying and modifying the GPIO and pin muxing state of a system, bypassing the kernel.
-piolib - A library for accessing the Pi 5's PIO hardware.
-raspinfo - A short script to dump information about the Pi. Intended for the submission of bug reports.
-vclog - A tool to get VideoCore 'assert' or 'msg' logs with optional -f to wait for new logs to arrive.
+%{summary}
+
+%package        dtmerge
+Summary:        A tool for applying compiled DT overlays (*.dtbo) to base Device Tree files (*.dtb)
+%description    dtmerge
+%{summary}. Also includes the dtoverlay and dtparam utilities.
+
+%package        eeptools
+Summary:        Tools for creating and managing EEPROMs for HAT+ and HAT board
+%description    eeptools
+%{summary}.
+
+%package        kdtc
+Requires:       dtc
+Summary:        A tool for compiling overlays with #includes, etc., as used in the kernel tree
+%description    kdtc
+%{summary}.
+
+%package        otpset
+Requires:       rpi-utils-vcmailbox = %{version}
+Summary:        A short script to help with reading and setting the customer OTP bits
+%description    otpset
+%{summary}.
+
+%package        overlaycheck
+Requires:       rpi-utils-dtmerge = %{version} 
+Requires:       rpi-utils-ovmerge = %{version}
+Summary:        A tool for validating the overlay files and README in a kernel source tree
+%description    overlaycheck
+%{summary}.
+
+%package        ovmerge
+Summary:        A tool for merging DT overlay source files (*-overlay.dts), flattening and sorting .dts files for easy comparison, displaying the include tree, etc
+%description    ovmerge
+%{summary}.
+
+%package        pinctrl
+Summary:        A more powerful replacement for raspi-gpio, a tool for displaying and modifying the GPIO and pin muxing state of a system, bypassing the kernel
+%description    pinctrl
+%{summary}.
+
+%package        piolib
+Summary:        A library for accessing the Pi 5's PIO hardware
+%description    piolib
+%{summary}.
+
+%package        vcgencmd
+Summary:        Query the VideoCore for information
+%description    vcgencmd
+A command line utility that can get various pieces of information
+from the VideoCore GPU on the Raspberry Pi.
+
+%package        vcmailbox
+Summary:        Send messages to the VideoCore via the mailbox
+%description    vcmailbox
+A low-level utility for sending mailbox messages to the VideoCore.
+
+%package        vclog
+Summary:        A tool to get VideoCore 'assert' or 'msg' logs with optional -f to wait for new logs to arrive
+%description    vclog
+%{summary}.
 
 %prep
-%autosetup -n utils-%commit
+%autosetup -p1 -n utils-%commit
 
 %build
-cmake .
-make
+%cmake
+%cmake_build
 
 %install
-mkdir -p %buildroot%_bindir
-install -pm755 dtmerge/dtmerge %buildroot%_bindir/
-install -pm755 dtmerge/dtoverlay %buildroot%_bindir/
-install -pm755 dtmerge/dtparam %buildroot%_bindir/
-install -pm755 eeptools/eepdump %buildroot%_bindir/
-install -pm755 eeptools/eepmake %buildroot%_bindir/
-install -pm755 eeptools/eepflash.sh %buildroot%_bindir/
-install -pm755 kdtc/kdtc %buildroot%_bindir/
-install -pm755 otpset/otpset %buildroot%_bindir/
-install -pm755 overlaycheck/overlaycheck %buildroot%_bindir/
-install -pm755 ovmerge/ovmerge %buildroot%_bindir/
-install -pm755 pinctrl/pinctrl %buildroot%_bindir/
-install -pm755 piolib/piopwm %buildroot%_bindir/
-install -pm755 piolib/dpi_interlace %buildroot%_bindir/
-install -pm755 piolib/pioseq %buildroot%_bindir/
-install -pm755 piolib/piotest %buildroot%_bindir/
-install -pm755 piolib/piows2812 %buildroot%_bindir/
-install -pm755 piolib/rp1sm %buildroot%_bindir/
-install -pm755 raspinfo/raspinfo %buildroot%_bindir/
-install -pm755 vcgencmd/vcgencmd %buildroot%_bindir/
-install -pm755 vclog/vclog %buildroot%_bindir/
-install -pm755 vcmailbox/vcmailbox %buildroot%_bindir/
+%cmake_install
 
 %files
 %doc README.md
-%_bindir/dtmerge
-%_bindir/dtoverlay
-%_bindir/dtparam
-%_bindir/eepdump
-%_bindir/eepmake
-%_bindir/eepflash.sh
-%_bindir/kdtc
-%_bindir/otpset
-%_bindir/overlaycheck
-%_bindir/ovmerge
-%_bindir/pinctrl
-%_bindir/piopwm
-%_bindir/dpi_interlace
-%_bindir/pioseq
-%_bindir/piotest
-%_bindir/piows2812
-%_bindir/rp1sm
-%_bindir/raspinfo
-%_bindir/vcgencmd
-%_bindir/vclog
-%_bindir/vcmailbox
+%license LICENCE
+
+%files dtmerge
+%license LICENCE
+%{_bindir}/dt*
+%{_mandir}/man1/dtmerge.1.gz
+%{_mandir}/man1/dtoverlay.1.gz
+%{_mandir}/man1/dtparam.1.gz
+%{_mandir}/man2/dtoverlay.2.gz
+
+%files eeptools
+%doc eeptools/README.md
+%license LICENCE
+%{_bindir}/eep*
+
+%files kdtc
+%doc kdtc/README.md
+%license LICENCE
+%{_bindir}/kdtc
+
+%files otpset
+%doc otpset/README.md
+%license LICENCE
+%{_bindir}/otpset
+
+%files overlaycheck
+%doc overlaycheck/README.md
+%license LICENCE
+%{_bindir}/overlaycheck
+
+%files ovmerge
+%doc ovmerge/README.md
+%license LICENCE
+%{_bindir}/ovmerge
+
+%files pinctrl
+%doc pinctrl/README.md
+%license LICENCE
+%{_bindir}/pinctrl
+%{_datadir}/bash-completion/completions/pinctrl
+
+%files piolib
+%doc piolib/README.md
+%license LICENCE
+%{_bindir}/apitest
+%{_bindir}/dpi_csync
+%{_bindir}/piopwm
+%{_bindir}/pioseq
+%{_bindir}/piotest
+%{_bindir}/piows2812
+%{_bindir}/rp1sm
+
+%files vcgencmd
+%license LICENCE
+%{_bindir}/vcgencmd
+%{_mandir}/man1/vcgencmd.1.gz
+%{_datadir}/bash-completion/completions/vcgencmd
+
+%files vclog
+%doc vclog/README.md
+%license LICENCE
+%{_bindir}/vclog
+
+%files vcmailbox
+%license LICENCE
+%{_bindir}/vcmailbox
+%{_mandir}/man1/vcmailbox.1.gz
+%{_mandir}/man7/vcmailbox.7.gz
+%{_mandir}/man7/raspiotp.7.gz
+%{_mandir}/man7/raspirev.7.gz
 
 %changelog
+* Tue Dec 17 2024 sadlerm <[email protected]>
+- Split into individual subpackages and no longer package raspinfo
+
 * Mon Nov 18 2024 Owen-sz <[email protected]>
 - Package Raspberry Pi Utils