diff --git a/raspberrypi-eeprom.spec b/raspberrypi-eeprom.spec index d79ea8ca28150ce25a0e602a4b09093c803b83b3..fa90ce5e558e6f8198b5afa2b8e956d0af7e1132 100644 --- a/raspberrypi-eeprom.spec +++ b/raspberrypi-eeprom.spec @@ -1,18 +1,17 @@ %global _firmware_path /lib/firmware -%define url_version 2023.01.11-138c0 +%define url_version 2024.04.20-2712 %global debug_package %{nil} Name: raspberrypi-eeprom -Version: 2023.01.11 +Version: 2024.04.20 Release: 1 -Summary: Raspberry Pi 4 EEPROM firmware +Summary: Raspberry Pi 4 and Pi 5 EEPROM firmware License: BSD-3-Clause and custom URL: https://github.com/raspberrypi/rpi-eeprom Source0: https://github.com/raspberrypi/rpi-eeprom/archive/v%{url_version}/rpi-eeprom-%{version}.tar.gz Patch0000: python3_env.patch -Patch0001: tr-instead-of-string-in-rpi-eeprom-update.patch AutoReq: no AutoProv: yes @@ -26,14 +25,13 @@ ExclusiveArch: aarch64 ExclusiveOS: Linux %description -Installation scripts and binaries for the closed sourced Raspberry Pi 4 EEPROMs. +Installation scripts and binaries for the Raspberry Pi 4 and Raspberry Pi 5 bootloader EEPROMs. %prep %setup -q -n %{name}-%{version} -c mv rpi-eeprom-%{url_version} %{name}-%{version} cd %{name}-%{version} %patch0000 -p1 -%patch0001 -p1 %build @@ -45,24 +43,39 @@ install -m 0755 rpi-eeprom-digest %{buildroot}%{_bindir} install -m 0755 rpi-eeprom-update %{buildroot}%{_bindir} mkdir -p %{buildroot}/etc/default install -m 644 rpi-eeprom-update-default %{buildroot}/etc/default/rpi-eeprom-update -mkdir -p %{buildroot}%{_firmware_path}/raspberrypi/bootloader -install -m 644 firmware/release-notes.md %{buildroot}%{_firmware_path}/raspberrypi/bootloader/ -mv firmware/beta %{buildroot}%{_firmware_path}/raspberrypi/bootloader -mv firmware/critical %{buildroot}%{_firmware_path}/raspberrypi/bootloader -mv firmware/stable %{buildroot}%{_firmware_path}/raspberrypi/bootloader -cp -a firmware/latest %{buildroot}%{_firmware_path}/raspberrypi/bootloader -cp -a firmware/default %{buildroot}%{_firmware_path}/raspberrypi/bootloader -%fdupes -s %{buildroot}%{_firmware_path}/raspberrypi/bootloader +install -m 0755 tools/rpi-bootloader-key-convert %{buildroot}%{_bindir} +install -m 0755 tools/rpi-otp-private-key %{buildroot}%{_bindir} +install -m 0755 tools/rpi-sign-bootcode %{buildroot}%{_bindir} + +for model in 2711 2712; do + mkdir -p %{buildroot}%{_firmware_path}/raspberrypi/bootloader-$model + install -m 644 firmware-$model/release-notes.md %{buildroot}%{_firmware_path}/raspberrypi/bootloader-$model/ + mv firmware-$model/beta %{buildroot}%{_firmware_path}/raspberrypi/bootloader-$model + mv firmware-$model/critical %{buildroot}%{_firmware_path}/raspberrypi/bootloader-$model + mv firmware-$model/stable %{buildroot}%{_firmware_path}/raspberrypi/bootloader-$model + cp -a firmware-$model/latest %{buildroot}%{_firmware_path}/raspberrypi/bootloader-$model + cp -a firmware-$model/default %{buildroot}%{_firmware_path}/raspberrypi/bootloader-$model + %fdupes -s %{buildroot}%{_firmware_path}/raspberrypi/bootloader-$model +done %files %license %{name}-%{version}/LICENSE %{_bindir}/rpi-eeprom-config %{_bindir}/rpi-eeprom-digest %{_bindir}/rpi-eeprom-update +%{_bindir}/rpi-bootloader-key-convert +%{_bindir}/rpi-otp-private-key +%{_bindir}/rpi-sign-bootcode %config /etc/default/rpi-eeprom-update %{_firmware_path}/raspberrypi %changelog +* Mon Apr 22 2024 Yafen Fang - 2024.04.20-1 +- update upstream version to 2024.04.20-2712 +- add Raspberry Pi 5 bootloader EEPROMs +- add rpi-bootloader-key-convert, rpi-otp-private-key, rpi-sign-bootcode +- remove patch for rpi-eeprom-update: use 'tr' instead of 'strings' + * Sat Mar 18 2023 Yafen Fang - 2023.01.11-1 - update upstream version to 2023.01.11-138c0 - update patch for rpi-eeprom-update: use 'tr' instead of 'strings' diff --git a/rpi-eeprom-2023.01.11.tar.gz b/rpi-eeprom-2024.04.20.tar.gz similarity index 56% rename from rpi-eeprom-2023.01.11.tar.gz rename to rpi-eeprom-2024.04.20.tar.gz index 1b5f65aa70fd81fb6b78f101b0367714d62734c5..b5d46594866aeb0a25877db0f78918dc47d89e1a 100644 Binary files a/rpi-eeprom-2023.01.11.tar.gz and b/rpi-eeprom-2024.04.20.tar.gz differ diff --git a/tr-instead-of-string-in-rpi-eeprom-update.patch b/tr-instead-of-string-in-rpi-eeprom-update.patch deleted file mode 100644 index b7648a63ad98c686db2db933ff8e013e5883785c..0000000000000000000000000000000000000000 --- a/tr-instead-of-string-in-rpi-eeprom-update.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/rpi-eeprom-update b/rpi-eeprom-update -index cb25316..431f24f 100755 ---- a/rpi-eeprom-update -+++ b/rpi-eeprom-update -@@ -125,7 +125,7 @@ getBootloaderConfig() { - local blconfig_nvmem_path="" - - if [ -f "${blconfig_alias}" ]; then -- local blconfig_ofnode_path="/sys/firmware/devicetree/base"$(strings "${blconfig_alias}")"" -+ local blconfig_ofnode_path="/sys/firmware/devicetree/base"$(tr -cd [:print:] < "${blconfig_alias}")"" - local blconfig_ofnode_link=$(find -L /sys/bus/nvmem -maxdepth 3 -samefile "${blconfig_ofnode_path}" 2>/dev/null) - - if [ -e "${blconfig_ofnode_link}" ]; then -@@ -185,7 +185,7 @@ applyRecoveryUpdate() - [ -n "${BOOTLOADER_UPDATE_IMAGE}" ] || [ -n "${VL805_UPDATE_IMAGE}" ] || die "No update images specified" - - getBootloaderCurrentVersion -- BOOTLOADER_UPDATE_VERSION=$(strings "${BOOTLOADER_UPDATE_IMAGE}" | grep BUILD_TIMESTAMP | sed 's/.*=//g') -+ BOOTLOADER_UPDATE_VERSION=$(tr -c [:print:] "\n" < "${BOOTLOADER_UPDATE_IMAGE}" | sed '/^BUILD_TIMESTAMP=/s/.*=//p;d') - if [ "${BOOTLOADER_CURRENT_VERSION}" -gt "${BOOTLOADER_UPDATE_VERSION}" ]; then - echo " WARNING: Installing an older bootloader version." - echo " Update the rpi-eeprom package to fetch the latest bootloader images." -@@ -310,7 +310,7 @@ getBootloaderUpdateVersion() { - match=".*/pieeprom-[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9].bin" - latest="$(find "${FIRMWARE_IMAGE_DIR}/" -maxdepth 1 -type f -size "${EEPROM_SIZE}c" -regex "${match}" | sort -r | head -n1)" - if [ -f "${latest}" ]; then -- BOOTLOADER_UPDATE_VERSION=$(strings "${latest}" | grep BUILD_TIMESTAMP | sed 's/.*=//g') -+ BOOTLOADER_UPDATE_VERSION=$(tr -c [:print:] "\n" < "${latest}" | sed '/^BUILD_TIMESTAMP=/s/.*=//p;d') - BOOTLOADER_UPDATE_IMAGE="${latest}" - fi - }