Merge pull request #301 from XECDesign/debian/buster

Debian/buster
This commit is contained in:
timg236
2021-02-22 19:29:37 +00:00
committed by GitHub
6 changed files with 19 additions and 3 deletions

13
debian/changelog vendored
View File

@@ -1,3 +1,16 @@
rpi-eeprom (11.8-1) buster; urgency=medium
[ Nicolas Saenz Julienne ]
* rpi-eeprom-update: Use 'tr' instead of 'strings'
[ Tim Gover ]
* pieeprom-2021-02-16: Promote to STABLE
[ Serge Schneider ]
* Packaging: remove binutils dependency
-- Serge Schneider <serge@raspberrypi.com> Mon, 22 Feb 2021 17:53:15 +0000
rpi-eeprom (11.7-1) buster; urgency=medium rpi-eeprom (11.7-1) buster; urgency=medium
[ Tim Gover ] [ Tim Gover ]

2
debian/control vendored
View File

@@ -11,7 +11,7 @@ Vcs-Git: https://github.com/raspberrypi/rpi-eeprom.git
Package: rpi-eeprom Package: rpi-eeprom
Architecture: armhf arm64 Architecture: armhf arm64
Depends: ${shlibs:Depends}, ${misc:Depends}, libraspberrypi-bin, python3, Depends: ${shlibs:Depends}, ${misc:Depends}, libraspberrypi-bin, python3,
binutils, raspberrypi-bootloader (>= 1.20190819), pciutils raspberrypi-bootloader (>= 1.20190819), pciutils
Breaks: rpi-eeprom-images (<<7.2) Breaks: rpi-eeprom-images (<<7.2)
Replaces: rpi-eeprom-images (<<7.2) Replaces: rpi-eeprom-images (<<7.2)
Recommends: flashrom Recommends: flashrom

View File

@@ -3,6 +3,9 @@
USB MSD boot also requires the firmware from Raspberry Pi OS 2020-08-20 or newer. USB MSD boot also requires the firmware from Raspberry Pi OS 2020-08-20 or newer.
https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md
## 2021-02-22 - Promote 2021-02-16 to stable - STABLE (LATEST)
* Freezing for default/critical update.
## 2021-02-16 - Change VC version info & TFTP fix - BETA ## 2021-02-16 - Change VC version info & TFTP fix - BETA
* Display the VC_BUILD strings instead of the sha256 of the .elf file so that * Display the VC_BUILD strings instead of the sha256 of the .elf file so that
the information is the same as "vcgencmd version" the information is the same as "vcgencmd version"

Binary file not shown.

Binary file not shown.

View File

@@ -113,7 +113,7 @@ getBootloaderConfig() {
local blconfig_nvmem_path="" local blconfig_nvmem_path=""
if [ -f "${blconfig_alias}" ]; then 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 -samefile "${blconfig_ofnode_path}" 2>/dev/null) local blconfig_ofnode_link=$(find -L /sys/bus/nvmem -samefile "${blconfig_ofnode_path}" 2>/dev/null)
if [ -e "${blconfig_ofnode_link}" ]; then if [ -e "${blconfig_ofnode_link}" ]; then
@@ -288,7 +288,7 @@ getBootloaderUpdateVersion() {
match=".*/pieeprom-[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9].bin" 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 -size "${EEPROM_SIZE}c" -regex "${match}" | sort -r | head -n1)"
if [ -f "${latest}" ]; then 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}" BOOTLOADER_UPDATE_IMAGE="${latest}"
fi fi
} }