search

volumio / Build

Buildscripts for Volumio System
GNU General Public License v2.0
113 stars 102 forks source link

[raspberry] Allow rpi-update to switch branches, remove obsolete firmware installation step #465

Closed ashthespy closed 3 years ago

ashthespy commented 3 years ago

Changes

-- Added back the ability to switch branches

-- Remove separate firmware installation

Not sure if this is still relevant but back in https://github.com/volumio/Build/commit/cac931eda81b99ff610cf0e9252dffb61388371a the ability to update firmware files as explicitly added. But then later down the line, https://github.com/volumio/Build/pull/191 hashes were synced, so that both kernel and firmware are obtained from the same SHA. Since we are now picking the firmware and kernel in sync with the same SHA, we can get rid of the second invocation of rpi-update

From build logs we see that it doesn't do anything, but we can remove it to remove confusion..

[ ---- ] Adding kernel 5.10.3 using rpi-update  
 *** Raspberry Pi firmware updater by Hexxeh, enhanced by AndrewS and Dom
 !!! //lib/modules doesn't exist - creating
 *** We're running for the first time
#############################################################
WARNING: This update bumps to rpi-5.10.y linux tree
See: https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
'rpi-update' should only be used if there is a specific
reason to do so - for example, a request by a Raspberry Pi
engineer or if you want to help the testing effort
and are comfortable with restoring if there are regressions.

DO NOT use 'rpi-update' as part of a regular update process.

##############################################################

 *** Downloading specific firmware revision (this will take a few minutes)
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100   168  100   168    0     0   1235      0 --:--:-- --:--:-- --:--:--  1282

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100  9.7M    0  9.7M    0     0  7971k      0 --:--:--  0:00:01 --:--:-- 10.9M
100 28.3M    0 28.3M    0     0  12.5M      0 --:--:--  0:00:02 --:--:-- 14.9M
100 34.0M    0 34.0M    0     0  10.4M      0 --:--:--  0:00:03 --:--:-- 11.7M
100 39.2M    0 39.2M    0     0  9425k      0 --:--:--  0:00:04 --:--:-- 10.0M
100 44.1M    0 44.1M    0     0  8596k      0 --:--:--  0:00:05 --:--:-- 9229k
100 49.6M    0 49.6M    0     0  8128k      0 --:--:--  0:00:06 --:--:-- 8167k
100 55.0M    0 55.0M    0     0  7761k      0 --:--:--  0:00:07 --:--:-- 5466k
100 59.9M    0 59.9M    0     0  7424k      0 --:--:--  0:00:08 --:--:-- 5289k
100 64.9M    0 64.9M    0     0  7173k      0 --:--:--  0:00:09 --:--:-- 5251k
100 70.4M    0 70.4M    0     0  7029k      0 --:--:--  0:00:10 --:--:-- 5377k
100 75.7M    0 75.7M    0     0  6882k      0 --:--:--  0:00:11 --:--:-- 5326k
100 80.9M    0 80.9M    0     0  6756k      0 --:--:--  0:00:12 --:--:-- 5300k
100 86.3M    0 86.3M    0     0  6669k      0 --:--:--  0:00:13 --:--:-- 5420k
100 92.0M    0 92.0M    0     0  6604k      0 --:--:--  0:00:14 --:--:-- 5548k
100 97.2M    0 97.2M    0     0  6527k      0 --:--:--  0:00:15 --:--:-- 5497k
100  102M    0  102M    0     0  6345k      0 --:--:--  0:00:16 --:--:-- 5186k
100  106M    0  106M    0     0  6291k      0 --:--:--  0:00:17 --:--:-- 5151k
100  109M    0  109M    0     0  6147k      0 --:--:--  0:00:18 --:--:-- 4763k
100  115M    0  115M    0     0  6147k      0 --:--:--  0:00:19 --:--:-- 4844k
100  119M    0  119M    0     0  6133k      0 --:--:--  0:00:19 --:--:-- 4858k
 *** Updating firmware
 *** Updating kernel modules
 *** depmod 5.10.3-v7+
 *** depmod 5.10.3-v8+
 *** depmod 5.10.3-v7l+
 *** depmod 5.10.3+
 *** Updating VideoCore libraries
 *** Using HardFP libraries
 *** Updating SDK
 *** Running ldconfig
 *** Storing current firmware revision
 *** Deleting downloaded files
 *** Syncing changes to disk
 *** If no errors appeared, your firmware was successfully updated to da59cb1161dc7c75727ec5c7636f632c52170961
 *** A reboot is needed to activate the new firmware
[ -- ] Getting actual kernel revision with firmware revision backup 
[ ---- ] Updating bootloader files *.elf *.dat *.bin  
 *** Raspberry Pi firmware updater by Hexxeh, enhanced by AndrewS and Dom
 *** Your firmware is already up to date

PS: I also checked that removing the .firmware_revision_kernel file doesn't break the volumio kernelsource command

volumio commented 3 years ago

Excellent!