From 7289c40028671455d8d939fd3a9e1e69e57caff3 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 17 Aug 2022 20:03:39 +0200
Subject: [PATCH] Update RPI EEPROM

---
 bcm27xx-eeprom/Makefile                       |  9 ++---
 ...date-chmod-silent-f-is-not-supported.patch | 33 +++++++++++++++++++
 .../0004-rpi-eeprom-update-remove-chmod.patch | 24 --------------
 ...om-config-change-default-text-editor.patch | 22 +++++++++++++
 4 files changed, 60 insertions(+), 28 deletions(-)
 create mode 100644 bcm27xx-eeprom/patches/0004-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch
 delete mode 100644 bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch
 create mode 100644 bcm27xx-eeprom/patches/0005-rpi-eeprom-config-change-default-text-editor.patch

diff --git a/bcm27xx-eeprom/Makefile b/bcm27xx-eeprom/Makefile
index 1dcf6883b..b114ee11a 100644
--- a/bcm27xx-eeprom/Makefile
+++ b/bcm27xx-eeprom/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bcm27xx-eeprom
-PKG_VERSION:=47976e4409c6999a8e211976c75c60a97c90275c
-PKG_RELEASE:=4
+PKG_VERSION:=v2022.04.26-138a1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/rpi-eeprom/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=skip
+PKG_HASH:=7c54839e68f226c5853fb63c8a1539b729d84b2e6bac311a51766c601d10a413
 
 PKG_LICENSE:=BSD-3-Clause Custom
 PKG_LICENSE_FILES:=LICENSE
@@ -21,7 +21,7 @@ TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
 define Package/bcm27xx-eeprom
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=bcm27xx-userland +blkid +pciutils +python3-light +coreutils +coreutils-od
+  DEPENDS:=bcm27xx-userland +blkid +coreutils +coreutils-od +pciutils +python3-light
   TITLE:=BCM27xx EEPROM tools
 endef
 
@@ -43,6 +43,7 @@ define Package/bcm27xx-eeprom/install
 
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rpi-eeprom-config $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rpi-eeprom-digest $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rpi-eeprom-update $(1)/usr/bin
 
 	$(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader
diff --git a/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch b/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch
new file mode 100644
index 000000000..5872f12da
--- /dev/null
+++ b/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch
@@ -0,0 +1,33 @@
+From 8376ac74390af0ad736c88615e128b82a75eebc0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Fri, 19 Feb 2021 10:54:23 +0100
+Subject: [PATCH] rpi-eeprom-update: chmod silent (-f) is not supported
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+---
+ rpi-eeprom-update | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/rpi-eeprom-update
++++ b/rpi-eeprom-update
+@@ -200,7 +200,7 @@ applyRecoveryUpdate()
+                 || die "Failed to copy ${TMP_EEPROM_IMAGE} to ${BOOTFS}"
+ 
+         # For NFS mounts ensure that the files are readable to the TFTP user
+-        chmod -f go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig" \
++        chmod go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig" \
+                 || die "Failed to set permissions on eeprom update files"
+    fi
+ 
+@@ -211,7 +211,7 @@ applyRecoveryUpdate()
+                 || die "Failed to copy ${VL805_UPDATE_IMAGE} to ${BOOTFS}/vl805.bin"
+ 
+         # For NFS mounts ensure that the files are readable to the TFTP user
+-        chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \
++        chmod go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \
+                 || die "Failed to set permissions on eeprom update files"
+    fi
+ 
diff --git a/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch b/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch
deleted file mode 100644
index a79fa89b1..000000000
--- a/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/rpi-eeprom-update	2020-11-05 21:58:02.247836497 +0100
-+++ b/rpi-eeprom-update	2020-11-05 21:58:36.911266307 +0100
-@@ -212,8 +212,8 @@
-                 || die "Failed to copy ${TMP_EEPROM_IMAGE} to ${BOOTFS}"
- 
-         # For NFS mounts ensure that the files are readable to the TFTP user
--        chmod -f go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig" \
--                || die "Failed to set permissions on eeprom update files"
-+        #chmod -f go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig" \
-+        #        || die "Failed to set permissions on eeprom update files"
-    fi
- 
-    if [ -n "${VL805_UPDATE_IMAGE}" ]; then
-@@ -224,8 +224,8 @@
-                 || die "Failed to copy ${VL805_UPDATE_IMAGE} to ${BOOTFS}/vl805.bin"
- 
-         # For NFS mounts ensure that the files are readable to the TFTP user
--        chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \
--                || die "Failed to set permissions on eeprom update files"
-+        #chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \
-+        #        || die "Failed to set permissions on eeprom update files"
-    fi
- 
-    cp -f "${RECOVERY_BIN}" "${BOOTFS}/recovery.bin" \
diff --git a/bcm27xx-eeprom/patches/0005-rpi-eeprom-config-change-default-text-editor.patch b/bcm27xx-eeprom/patches/0005-rpi-eeprom-config-change-default-text-editor.patch
new file mode 100644
index 000000000..6feb7602c
--- /dev/null
+++ b/bcm27xx-eeprom/patches/0005-rpi-eeprom-config-change-default-text-editor.patch
@@ -0,0 +1,22 @@
+--- a/rpi-eeprom-config
++++ b/rpi-eeprom-config
+@@ -166,8 +166,8 @@ def edit_config(eeprom=None):
+     """
+     Implements something like 'git commit' for editing EEPROM configs.
+     """
+-    # Default to nano if $EDITOR is not defined.
+-    editor = 'nano'
++    # Default to vi if $EDITOR is not defined.
++    editor = 'vi'
+     if 'EDITOR' in os.environ:
+         editor = os.environ['EDITOR']
+ 
+@@ -428,7 +428,7 @@ Operating modes:
+ 
+    To cancel the pending update run 'sudo rpi-eeprom-update -r'
+ 
+-   The default text editor is nano and may be overridden by setting the 'EDITOR'
++   The default text editor is vi and may be overridden by setting the 'EDITOR'
+    environment variable and passing '-E' to 'sudo' to preserve the environment.
+ 
+ 6. Signing the bootloader config file.