Accepting request 1286863 from hardware:boot

OBS-URL: https://build.opensuse.org/request/show/1286863
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/raspberrypi-eeprom?expand=0&rev=12

_service

@@ -1,17 +1,17 @@
 <services>
-	<service name="tar_scm" mode="disabled">
+	<service name="tar_scm" mode="manual">
 		<param name="scm">git</param>
 		<param name="url">https://github.com/raspberrypi/rpi-eeprom.git</param>
 		<param name="filename">raspberrypi-eeprom</param>
-		<param name="revision">bf7419c961e8b65854fd73ec29fbc515087539e8</param>
+		<param name="revision">1bb6edeff52c6d30c358f0a7e7a0db47427a7e21</param>
 		<param name="versionrewrite-pattern">v([0-9\.]{10}).*</param>
 		<param name="versionformat">@PARENT_TAG@</param>
 <!--
 		<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@~g%h</param>
 -->
 	</service>
-	<service name="set_version" mode="disabled"/>
+	<service name="set_version" mode="manual"/>
-	<service name="recompress" mode="disabled">
+	<service name="recompress" mode="manual">
 		<param name="file">*.tar</param>
 		<param name="compression">xz</param>
 	</service>

add-suse-config.patch

@@ -1,25 +1,13 @@
-From d1d1945ef34cab5ff0d41eda2e08266f417be3dc Mon Sep 17 00:00:00 2001
+diff --git a/rpi-eeprom-update b/rpi-eeprom-update
-From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+index 984ade2..c50a5b1 100755
-Date: Fri, 22 Jan 2021 16:54:49 +0100
+--- a/rpi-eeprom-update
-Subject: [PATCH] Add suse config
++++ b/rpi-eeprom-update
-
+@@ -688,7 +688,7 @@ findBootFS()
-Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+       BOOTFS="${TMP_BOOTFS_MNT}"
----
+    elif [ -z "$BOOTFS" ]; then
- rpi-eeprom-update-default | 4 ++--
+       if ! BOOTFS=$(/usr/lib/raspberrypi-sys-mods/get_fw_loc 2> /dev/null); then
- 1 file changed, 2 insertions(+), 2 deletions(-)
+-         for BOOTFS in /boot/firmware /boot; do
-
++         for BOOTFS in /boot/efi /boot; do
-diff --git a/rpi-eeprom-update-default b/rpi-eeprom-update-default
+             if [ -f "${BOOTFS}/config.txt" ]; then
-index f567b6a..7111176 100644
+                break
---- a/rpi-eeprom-update-default
+             elif findmnt --fstab "$BOOTFS" > /dev/null; then
-+++ b/rpi-eeprom-update-default
-@@ -3,6 +3,6 @@ FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader
- FIRMWARE_RELEASE_STATUS="critical"
- FIRMWARE_IMAGE_DIR="${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}"
- FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup"
--BOOTFS=/boot
-+BOOTFS=/boot/efi
- USE_FLASHROM=0
- EEPROM_CONFIG_HOOK=
--- 
-2.30.0
-

raspberrypi-eeprom-2025.05.08.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f29b1e483f66073bc94f31eea2eb733c0da2eff76b36b95da9af3581062ba3f5
+size 15131684

raspberrypi-eeprom.changes

@@ -1,3 +1,48 @@
+-------------------------------------------------------------------
+Thu Jun 19 08:19:44 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to 2025.05.08
+
+-------------------------------------------------------------------
+Mon Sep  9 10:41:02 UTC 2024 - Ivan Ivanov <ivan.ivanov@suse.com>
+
+- Completely delete strings command check. Fixes (bsc#1230279)
+
+-------------------------------------------------------------------
+Tue Sep  3 12:12:53 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to 2024.06.05
+- Skipped: 
+  * v2024.04.20-2712
+  * v2024.02.17-2712
+  * v2024.02.16-2712
+  * v.2024.01.05-2712
+  * v2023.12.06-2712
+- Refresh patch:
+  * rpi-eeprom-update-Use-tr-instead-of-strings.patch
+
+-------------------------------------------------------------------
+Thu Nov 23 10:12:48 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to v2023.10.30:
+  * Fix SDIO / WiFi clock-setup for BOOT_ORDER=0xf14
+  * Fix SD power-on-reset
+  * Firmware support for improved watchdog driver
+  * Update DHCP Option97 to be R,P,i,5 on Pi5
+- Updates from skipped v2023.10.18:
+  * Add support for HAT gpiomap for improved HAT compatibility.
+  * Add I2C probe for DSI display auto detect
+  * Automatically set dtparam=nvme if booted from nvme
+  * Fix network boot reset issue where only the first attempt works.
+  * Adding pciex4_reset=0 to config.txt will leave RP1 PCIe enabled
+    when ARM stage is started.
+  * Prevent HDMI diagnostics being displayed immediately when
+    waking after HALT.
+  * Update board-name - "Raspberry Pi 5"
+- Refresh patches:
+  * add-suse-config.patch
+  * rpi-eeprom-update-Use-tr-instead-of-strings.patch
+
 -------------------------------------------------------------------
 Sun Jan 29 14:42:22 UTC 2023 - Tobias Klausmann <tobias.klausmann@freenet.de>
 

raspberrypi-eeprom.obsinfo

@@ -1,4 +0,0 @@
-name: raspberrypi-eeprom
-version: 2023.01.11
-mtime: 1674059670
-commit: bf7419c961e8b65854fd73ec29fbc515087539e8

raspberrypi-eeprom.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package raspberrypi-eeprom
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,9 +21,9 @@
 %endif
 
 Name:           raspberrypi-eeprom
-Version:        2023.01.11
+Version:        2025.05.08
 Release:        0
-Summary:        Raspberry Pi 4 EEPROM firmware
+Summary:        Raspberry Pi 4 and Pi 5 EEPROM firmware
 License:        SUSE-Firmware
 Group:          System/Boot
 URL:            https://github.com/raspberrypi/rpi-eeprom
@@ -42,7 +42,7 @@ Requires:       raspberrypi-eeprom-firmware
 BuildArch:      noarch
 
 %description
-First stage bootloader packages for Raspberry Pi 4
+First stage bootloader packages for Raspberry Pi 4 and Pi 5
 
 %package firmware
 Summary:        Raspberry Pi 4 EEPROM firmware blobs
@@ -53,11 +53,14 @@ Requires:       raspberrypi-eeprom
 BuildRequires:  fdupes
 
 %description firmware
-First stage bootloader fimware blobs for Raspberry Pi 4
+First stage bootloader fimware blobs for Raspberry Pi 4 and Pi 5
 
 %prep
 %autosetup -p1
 
+# 'strings' not needed - https://github.com/raspberrypi/rpi-eeprom/commit/ef0cfffced1bbee8ae6755ddf58e478c3d8c8f05
+sed -i '/if ! command -v strings/, /fi/d' rpi-eeprom-update
+
 %build
 
 %install
@@ -68,13 +71,15 @@ 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}/%{_firmwaredir}/raspberrypi/bootloader
+for model in 2711 2712; do
-mv firmware/beta %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader
+  mkdir -p %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
-mv firmware/critical %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader
+  mv firmware-$model/beta %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
-mv firmware/stable %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader
+  mv firmware-$model/critical %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
-cp -a firmware/latest %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader
+  mv firmware-$model/stable %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
-cp -a firmware/default %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader
+  cp -a firmware-$model/latest %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
-%fdupes -s %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader
+  cp -a firmware-$model/default %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
+  %fdupes -s %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
+done
 
 %files
 %license LICENSE
@@ -86,10 +91,10 @@ cp -a firmware/default %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader
 %files firmware
 %{_firmwaredir}
 %{_firmwaredir}/raspberrypi
-%{_firmwaredir}/raspberrypi/bootloader/beta
+%{_firmwaredir}/raspberrypi/bootloader-*/beta
-%{_firmwaredir}/raspberrypi/bootloader/critical
+%{_firmwaredir}/raspberrypi/bootloader-*/critical
-%{_firmwaredir}/raspberrypi/bootloader/stable
+%{_firmwaredir}/raspberrypi/bootloader-*/stable
-%{_firmwaredir}/raspberrypi/bootloader/latest
+%{_firmwaredir}/raspberrypi/bootloader-*/latest
-%{_firmwaredir}/raspberrypi/bootloader/default
+%{_firmwaredir}/raspberrypi/bootloader-*/default
 
 %changelog

rpi-eeprom-update-Use-tr-instead-of-strings.patch

@@ -1,4 +1,4 @@
-From 462564a95da99016969128dedc6b14ea66b12b17 Mon Sep 17 00:00:00 2001
+From 8dbe479a2cc88c960c90054a5106ccfcdcd86ab4 Mon Sep 17 00:00:00 2001
 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 Date: Thu, 18 Feb 2021 17:49:46 +0100
 Subject: [PATCH] rpi-eeprom-update: Use 'tr' instead of 'strings'
@@ -23,10 +23,10 @@ Signed-off-by: Tobias Klausmann <tobias.klausmann@freenet.de>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/rpi-eeprom-update b/rpi-eeprom-update
-index cb25316..431f24f 100755
+index 6b54757..5ddf15a 100755
 --- a/rpi-eeprom-update
 +++ b/rpi-eeprom-update
-@@ -125,7 +125,7 @@ getBootloaderConfig() {
+@@ -127,7 +127,7 @@ getBootloaderConfig() {
     local blconfig_nvmem_path=""
  
     if [ -f "${blconfig_alias}" ]; then
@@ -35,18 +35,18 @@ index cb25316..431f24f 100755
        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()
+@@ -194,7 +194,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."
+       warn "   WARNING: Installing an older bootloader version."
-       echo "            Update the rpi-eeprom package to fetch the latest bootloader images."
+       warn "            Update the rpi-eeprom package to fetch the latest bootloader images."
-@@ -310,7 +310,7 @@ getBootloaderUpdateVersion() {
+@@ -367,7 +367,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)"
+    latest="$(find "${FIRMWARE_IMAGE_DIR}/" -maxdepth 1 -type f -follow -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')
@@ -54,5 +54,5 @@ index cb25316..431f24f 100755
     fi
  }
 -- 
-2.39.1
+2.46.0