Merge pull request #97 from XECDesign/debian/buster

Debian/buster

debian/changelog

@@ -1,3 +1,20 @@
+rpi-eeprom (5.0-1) buster; urgency=medium
+
+  [ Justin P ]
+  * Clarifying the Dated .bin files
+  * Formatting and Phrasing changes
+  * Adjusted workding once more
+
+  [ Tim Gover ]
+  * rpi-eeprom-update: Remove dependency on vl805
+  * firmware: Promote the latest beta firmware to stable
+
+  [ Serge Schneider ]
+  * Set architecture to 'all'
+  * Add python-minimal build dependency
+
+ -- Serge Schneider <serge@raspberrypi.org>  Fri, 28 Feb 2020 14:41:56 +0000
+
 rpi-eeprom (4.0-1) buster; urgency=medium
 
   [ Tim Gover ]

debian/control

@@ -2,14 +2,14 @@ Source: rpi-eeprom
 Section: misc
 Priority: optional
 Maintainer: Serge Schneider <serge@raspberrypi.org>
-Build-Depends: debhelper (>= 11), help2man
+Build-Depends: debhelper (>= 11), help2man, python-minimal
 Standards-Version: 4.1.3
 Homepage: https://github.com/raspberrypi/rpi-eeprom/
 Vcs-Browser: https://github.com/raspberrypi/rpi-eeprom/
 Vcs-Git: https://github.com/raspberrypi/rpi-eeprom.git
 
 Package: rpi-eeprom
-Architecture: armhf
+Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, rpi-eeprom-images, libraspberrypi-bin,
  python, binutils, raspberrypi-bootloader (>= 1.20190819)
 Recommends: flashrom

debian/rpi-eeprom.install

@@ -1,4 +1,3 @@
 rpi-eeprom-config usr/bin/
 rpi-eeprom-update usr/bin/
 debian/default/ etc/
-firmware/vl805 usr/bin/

debian/rules

@@ -14,7 +14,7 @@ override_dh_auto_build: debian/rpi-eeprom-update.1 debian/rpi-eeprom-config.1
 override_dh_install:
 	mkdir -p debian/rpi-eeprom/var/lib/raspberrypi/bootloader/backup/
 	dh_install
-	rm debian/rpi-eeprom-images/lib/firmware/raspberrypi/bootloader/vl805
+	rm -f debian/rpi-eeprom-images/lib/firmware/raspberrypi/bootloader/vl805
 
 debian/rpi-eeprom-update.1:
 	help2man -N --version-string="${DEB_VERSION_UPSTREAM}" --help-option="-h" \

firmware/raspberry_pi4_network_boot_beta.md

@@ -40,9 +40,11 @@ sudo echo FIRMWARE_RELEASE_STATUS="beta" > /etc/default/rpi-eeprom-update
 
 ### Configuration - Enable network boot
 Network boot is not enabled by default in the bootloader. To enable it the bootloader configuration file must be edited.
+
+**NOTE:** The `/lib/firmware...` file listed in the code block below should not be copied directly, as it requires a date be maually used. There are several versions of the beta bootloader inside that directory, so make sure to select the most up-to-date version for your Raspberry Pi.
 ```
 # Extract the configuration file
-cp /lib/firmware/raspberrypi/bootloader/beta/pieeprom-2019-09-23.bin pieeprom.bin
+cp /lib/firmware/raspberrypi/bootloader/beta/pieeprom-YYYY-MM-DD.bin pieeprom.bin
 rpi-eeprom-config pieeprom.bin > bootconf.txt
 
 # Enable network boot

firmware/release-notes.md

@@ -1,5 +1,16 @@
 # Raspberry Pi4 bootloader EEPROM release notes
 
+## 2020-02-27 rpi-eeprom-update & firmware
+    * Remove the dependency check for the vl805 utility. This is deprecated
+      and there is no 64-bit version. The file is still available in Github
+      for anyone who wants to continue using USE_FLASHROM or create their
+      own scripts.
+    * Add a stable firmware directory based on the latest beta release.
+      Stable should be interpreted as feature-freeze releases. In this
+      case the core network boot is stable enough for most scenarios
+      and this de-risks adding new more experimental features in the
+      beta folder.
+
 ## 2020-01-22 - vl805 00137ad
     * Set the default/critical vl805 version to be 00137ad. This has the 
       same power savings as 0137ab but with fixes for USB webcams.

rpi-eeprom-update

@@ -11,8 +11,7 @@ if [ -f /etc/default/rpi-eeprom-update ]; then
 fi
 
 FIRMWARE_ROOT=${FIRMWARE_ROOT:-/lib/firmware/raspberrypi/bootloader}
-# May be used to select beta releases instead of the default critical
-# updates.
+# May be used to select beta or stable releases instead of the default critical updates.
 FIRMWARE_RELEASE_STATUS=${FIRMWARE_RELEASE_STATUS:-critical}
 FIRMWARE_IMAGE_DIR=${FIRMWARE_IMAGE_DIR:-${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}}
 FIRMWARE_BACKUP_DIR=${FIRMWARE_BACKUP_DIR:-/var/lib/raspberrypi/bootloader/backup}
@@ -262,10 +261,6 @@ checkDependencies() {
       FIRMWARE_IMAGE_DIR="${FIRMWARE_IMAGE_DIR}-${BOARD_REVISION}"
    fi
 
-   if ! command -v vl805 > /dev/null; then
-      die "vl805 command not found. On Debian, try reinstalling the rpi-eeprom package."
-   fi
-
    if vcgencmd bootloader_config | grep -qi "Command not registered"; then
       die "vcgencmd: 'bootloader_config' command not supported. Please update VC firmware and reboot."
    fi
@@ -362,10 +357,10 @@ those devices to stop working until after the system is reboot.
 FIRMWARE_RELEASE_STATUS
 
 Specifies the release status of the firmware to apply. The default is 'critical'
-which is the most stable production version. Alternatively, 'beta' may be selected
-for development releases.
+which is the most stable production version. Alternatively, 'stable' or
+'beta' may be selected for development releases.
 A 'critical' update is the latest stable production version and is normally
-only updated after it has been tested via the 'beta' release.
+only updated after it has been tested via the 'beta' and then a 'stable' release.
 Before selecting a firmware release directory this script checks whether there
 is a board revision specific variant e.g. critical-c03111. If present then the
 board-revision specific version is used in preference.