Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package raspberrypi-eeprom for
openSUSE:Factory checked in at 2023-01-30 17:11:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/raspberrypi-eeprom (Old)
and /work/SRC/openSUSE:Factory/.raspberrypi-eeprom.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "raspberrypi-eeprom"
Mon Jan 30 17:11:21 2023 rev:8 rq:1062017 version:2023.01.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/raspberrypi-eeprom/raspberrypi-eeprom.changes
2023-01-23 18:33:41.360776722 +0100
+++
/work/SRC/openSUSE:Factory/.raspberrypi-eeprom.new.32243/raspberrypi-eeprom.changes
2023-01-30 17:15:44.426063078 +0100
@@ -1,0 +2,6 @@
+Sun Jan 29 14:42:22 UTC 2023 - Tobias Klausmann <tobias.klausm...@freenet.de>
+
+- Refresh patch rpi-eeprom-update-Use-tr-instead-of-strings.patch
+ Replace the third source for "strings" as well
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpi-eeprom-update-Use-tr-instead-of-strings.patch ++++++
--- /var/tmp/diff_new_pack.dtgL8D/_old 2023-01-30 17:15:45.246067439 +0100
+++ /var/tmp/diff_new_pack.dtgL8D/_new 2023-01-30 17:15:45.250067460 +0100
@@ -1,4 +1,4 @@
-From b760758c5eee3ff26d6705491ed3630f3079fff6 Mon Sep 17 00:00:00 2001
+From 462564a95da99016969128dedc6b14ea66b12b17 Mon Sep 17 00:00:00 2001
From: Nicolas Saenz Julienne <nsaenzjulie...@suse.de>
Date: Thu, 18 Feb 2021 17:49:46 +0100
Subject: [PATCH] rpi-eeprom-update: Use 'tr' instead of 'strings'
@@ -8,22 +8,25 @@
size (20-50 MB). So, convert all uses of 'strings' to 'tr' so as to
avoid the package dependency.
-The second 'tr' usage converts non-ASCII characters into newlines so as
-to isolate the "BUILD_TIMESTAMP=1234567890" statement (similar to what
+The second and third 'tr' usage converts non-ASCII characters into newlines
+so as to isolate the "BUILD_TIMESTAMP=1234567890" statement (similar to what
'strings' does). There is no need for this in the first one: non-ASCII
characters are simply discarded as DT aliases have a fixed one line
format.
+[tobijk]: Add hunk for third string replacement
+
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulie...@suse.de>
+Signed-off-by: Tobias Klausmann <tobias.klausm...@freenet.de>
---
- rpi-eeprom-update | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ rpi-eeprom-update | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rpi-eeprom-update b/rpi-eeprom-update
-index 332d39c..e4df232 100755
+index cb25316..431f24f 100755
--- a/rpi-eeprom-update
+++ b/rpi-eeprom-update
-@@ -113,7 +113,7 @@ getBootloaderConfig() {
+@@ -125,7 +125,7 @@ getBootloaderConfig() {
local blconfig_nvmem_path=""
if [ -f "${blconfig_alias}" ]; then
@@ -32,7 +35,16 @@
local blconfig_ofnode_link=$(find -L /sys/bus/nvmem -maxdepth 3
-samefile "${blconfig_ofnode_path}" 2>/dev/null)
if [ -e "${blconfig_ofnode_link}" ]; then
-@@ -288,7 +288,7 @@ getBootloaderUpdateVersion() {
+@@ -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
@@ -42,6 +54,6 @@
fi
}
--
-2.30.1
+2.39.1
