1
0
Dominique Leuenberger 2024-09-04 11:23:26 +00:00 committed by Git OBS Bridge
commit b3ba895a76
6 changed files with 35 additions and 16 deletions

View File

@ -3,7 +3,7 @@
<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">6b14e84a2fb2e1f7220a404f65e7e0985f07c9e5</param>
<param name="revision">ef2fc67d235d037b2b468813e646e20890fcea07</param>
<param name="versionrewrite-pattern">v([0-9\.]{10}).*</param>
<param name="versionformat">@PARENT_TAG@</param>
<!--

View File

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

View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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>

View File

@ -1,7 +1,7 @@
#
# spec file for package raspberrypi-eeprom
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@
%endif
Name: raspberrypi-eeprom
Version: 2023.10.30
Version: 2024.06.05
Release: 0
Summary: Raspberry Pi 4 and Pi 5 EEPROM firmware
License: SUSE-Firmware
@ -58,6 +58,9 @@ 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 's/die "strings not found./#die "strings not found./' rpi-eeprom-update
%build
%install

View File

@ -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,28 +23,28 @@ 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
@@ -122,7 +122,7 @@ getBootloaderConfig() {
@@ -127,7 +127,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
@@ -189,7 +189,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."
echo " Update the rpi-eeprom package to fetch the latest bootloader images."
@@ -358,7 +358,7 @@ getBootloaderUpdateVersion() {
warn " WARNING: Installing an older bootloader version."
warn " Update the rpi-eeprom package to fetch the latest bootloader images."
@@ -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 -follow -size "${EEPROM_SIZE}c" -regex "${match}" | sort -r | head -n1)"
if [ -f "${latest}" ]; then
@ -53,3 +53,6 @@ index cb25316..431f24f 100755
BOOTLOADER_UPDATE_IMAGE="${latest}"
fi
}
--
2.46.0