GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/chromeos/crosfirmware.sh: Print more messages 

The existing code has several messages that are only printed when the
DEBUG variable is set. These messages are not verbose, and are quite
useful to see how the script is progressing. So, print them
unconditionally.

Change-Id: I8f78e4563f0b4a42f831194a6e526284c2fbcd92
Signed-off-by: Tristan Corrick <tristan@corrick.kiwi>
Reviewed-on: https://review.coreboot.org/c/30550
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Tristan Corrick 2018-12-31 20:58:43 +13:00 committed by Patrick Georgi
parent d80607da4d
commit f50bd6d82d
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
util/chromeos/crosfirmware.sh
View File

@ -14,16 +14,9 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
#DEBUG=1
# On some systems, `parted` and `debugfs` are located in /sbin. # On some systems, `parted` and `debugfs` are located in /sbin.
export PATH="$PATH:/sbin" export PATH="$PATH:/sbin"
debug()
{
test "$DEBUG" == "1" && echo "$*"
}
exit_if_uninstalled() { exit_if_uninstalled() {
local cmd_name="$1" local cmd_name="$1"
local deb_pkg_name="$2" local deb_pkg_name="$2"
@ -51,7 +44,7 @@ get_inventory()
_conf=$1 _conf=$1
_url=https://dl.google.com/dl/edgedl/chromeos/recovery/recovery.conf _url=https://dl.google.com/dl/edgedl/chromeos/recovery/recovery.conf
debug "Downloading recovery image inventory..." echo "Downloading recovery image inventory..."
curl -s "$_url" > $_conf curl -s "$_url" > $_conf
} }
@ -61,9 +54,9 @@ download_image()
_url=$1 _url=$1
_file=$2 _file=$2
debug "Downloading recovery image" echo "Downloading recovery image"
curl "$_url" > "$_file.zip" curl "$_url" > "$_file.zip"
debug "Decompressing recovery image" echo "Decompressing recovery image"
unzip -q "$_file.zip" unzip -q "$_file.zip"
rm "$_file.zip" rm "$_file.zip"
} }
@ -75,7 +68,7 @@ extract_partition()
ROOTFS=$3 ROOTFS=$3
_bs=1024 _bs=1024
debug "Extracting ROOT-A partition" echo "Extracting ROOT-A partition"
ROOTP=$( printf "unit\nB\nprint\nquit\n" | \ ROOTP=$( printf "unit\nB\nprint\nquit\n" | \
parted $FILE 2>/dev/null | grep $NAME ) parted $FILE 2>/dev/null | grep $NAME )
@ -91,7 +84,7 @@ extract_shellball()
ROOTFS=$1 ROOTFS=$1
SHELLBALL=$2 SHELLBALL=$2
debug "Extracting chromeos-firmwareupdate" echo "Extracting chromeos-firmwareupdate"
printf "cd /usr/sbin\ndump chromeos-firmwareupdate $SHELLBALL\nquit" | \ printf "cd /usr/sbin\ndump chromeos-firmwareupdate $SHELLBALL\nquit" | \
debugfs $ROOTFS > /dev/null 2>&1 debugfs $ROOTFS > /dev/null 2>&1
} }
@ -101,7 +94,7 @@ extract_coreboot()
_shellball=$1 _shellball=$1
_unpacked=$( mktemp -d ) _unpacked=$( mktemp -d )
debug "Extracting coreboot image" echo "Extracting coreboot image"
sh $_shellball --sb_extract $_unpacked > /dev/null sh $_shellball --sb_extract $_unpacked > /dev/null
_version=$( cat $_unpacked/VERSION | grep BIOS\ version: | \ _version=$( cat $_unpacked/VERSION | grep BIOS\ version: | \