When firmware images only contained compressed kernels and squashfs roots,
uncompressed tar files were a good option. We are now using UBIFS images,
both raw and tarred, as well as ubinized (full UBI partition) images, all
of which benefit greatly from compression.
For example, a raw ubinized backup taken from a running Askey RT4230W REV6
(such full backups can be restored via the LUCI's sysupgrade UI) is over
400 MB, but compresses to less than 10 MB.
This commit adds support for gzipped versions of all file types already
accepted by the nand sysupgrade mechanism, be them raw or tarred.
Signed-off-by: Rodrigo Balerdi <lanchon@gmail.com>
}
nand_get_magic_long() {
}
nand_get_magic_long() {
- dd if="$1" skip=$2 bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+ (${3}cat "$1" | dd bs=4 "skip=${2:-0}" count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null
- ( tar xf $1 $2 -O | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null
+ (tar x${3}f "$1" "$2" -O | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null
"4349"*)
echo "combined"
;;
"4349"*)
echo "combined"
;;
+ "1f8b"*)
+ echo "gzip"
+ ;;
*)
echo "unknown $magic"
;;
*)
echo "unknown $magic"
;;
- identify_magic $(nand_get_magic_long "$1" "${2:-0}")
+ identify_magic $(nand_get_magic_long "$@")
- identify_magic $(get_magic_long_tar "$1" "$2")
+ identify_magic $(get_magic_long_tar "$@")
+}
+
+identify_if_gzip() {
+ if [ "$(identify "$1")" = gzip ]; then echo -n z; fi
}
nand_restore_config() {
}
nand_restore_config() {
# Write the UBI image to MTD ubi partition
nand_upgrade_ubinized() {
local ubi_file="$1"
# Write the UBI image to MTD ubi partition
nand_upgrade_ubinized() {
local ubi_file="$1"
nand_detach_ubi "$CI_UBIPART" || return 1
local mtdnum="$( find_mtd_index "$CI_UBIPART" )"
nand_detach_ubi "$CI_UBIPART" || return 1
local mtdnum="$( find_mtd_index "$CI_UBIPART" )"
- ubiformat "/dev/mtd$mtdnum" -y -f "$ubi_file" && ubiattach -m "$mtdnum"
+ ${gz}cat "$ubi_file" | ubiformat "/dev/mtd$mtdnum" -y -f - && ubiattach -m "$mtdnum"
}
# Write the UBIFS image to UBI rootfs volume
nand_upgrade_ubifs() {
}
# Write the UBIFS image to UBI rootfs volume
nand_upgrade_ubifs() {
- local rootfs_length=$( (cat $1 | wc -c) 2> /dev/null)
+ local ubifs_file="$1"
+ local gz="$2"
- nand_upgrade_prepare_ubi "$rootfs_length" "ubifs" "" "" || return 1
+ local ubifs_length=$( (${gz}cat "$ubifs_file" | wc -c) 2> /dev/null)
+
+ nand_upgrade_prepare_ubi "$ubifs_length" "ubifs" "" "" || return 1
local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
local root_ubivol="$(nand_find_volume $ubidev "$CI_ROOTPART")"
local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
local root_ubivol="$(nand_find_volume $ubidev "$CI_ROOTPART")"
- ubiupdatevol /dev/$root_ubivol -s $rootfs_length $1
+ ${gz}cat "$ubifs_file" | ubiupdatevol /dev/$root_ubivol -s "$ubifs_length" -
}
# Write the FIT image to UBI kernel volume
nand_upgrade_fit() {
local fit_file="$1"
}
# Write the FIT image to UBI kernel volume
nand_upgrade_fit() {
local fit_file="$1"
- local fit_length="$(wc -c < "$fit_file")"
+ local gz="$2"
+
+ local fit_length=$( (${gz}cat "$fit_file" | wc -c) 2> /dev/null)
nand_upgrade_prepare_ubi "" "" "$fit_length" "1" || return 1
local fit_ubidev="$(nand_find_ubi "$CI_UBIPART")"
local fit_ubivol="$(nand_find_volume $fit_ubidev "$CI_KERNPART")"
nand_upgrade_prepare_ubi "" "" "$fit_length" "1" || return 1
local fit_ubidev="$(nand_find_ubi "$CI_UBIPART")"
local fit_ubivol="$(nand_find_volume $fit_ubidev "$CI_KERNPART")"
- ubiupdatevol /dev/$fit_ubivol -s $fit_length $fit_file
+ ${gz}cat "$fit_file" | ubiupdatevol /dev/$fit_ubivol -s "$fit_length" -
}
# Write images in the TAR file to MTD partitions and/or UBI volumes as required
nand_upgrade_tar() {
local tar_file="$1"
}
# Write images in the TAR file to MTD partitions and/or UBI volumes as required
nand_upgrade_tar() {
local tar_file="$1"
# WARNING: This fails if tar contains more than one 'sysupgrade-*' directory.
# WARNING: This fails if tar contains more than one 'sysupgrade-*' directory.
- local board_dir="$(tar tf "$tar_file" | grep -m 1 '^sysupgrade-.*/$')"
+ local board_dir="$(tar t${gz}f "$tar_file" | grep -m 1 '^sysupgrade-.*/$')"
board_dir="${board_dir%/}"
local kernel_mtd kernel_length
if [ "$CI_KERNPART" != "none" ]; then
kernel_mtd="$(find_mtd_index "$CI_KERNPART")"
board_dir="${board_dir%/}"
local kernel_mtd kernel_length
if [ "$CI_KERNPART" != "none" ]; then
kernel_mtd="$(find_mtd_index "$CI_KERNPART")"
- kernel_length=$( (tar xf "$tar_file" "$board_dir/kernel" -O | wc -c) 2> /dev/null)
+ kernel_length=$( (tar x${gz}f "$tar_file" "$board_dir/kernel" -O | wc -c) 2> /dev/null)
[ "$kernel_length" = 0 ] && kernel_length=
fi
[ "$kernel_length" = 0 ] && kernel_length=
fi
- local rootfs_length=$( (tar xf "$tar_file" "$board_dir/root" -O | wc -c) 2> /dev/null)
+ local rootfs_length=$( (tar x${gz}f "$tar_file" "$board_dir/root" -O | wc -c) 2> /dev/null)
[ "$rootfs_length" = 0 ] && rootfs_length=
local rootfs_type
[ "$rootfs_length" = 0 ] && rootfs_length=
local rootfs_type
- [ "$rootfs_length" ] && rootfs_type="$(identify_tar "$tar_file" "$board_dir/root")"
+ [ "$rootfs_length" ] && rootfs_type="$(identify_tar "$tar_file" "$board_dir/root" "$gz")"
local ubi_kernel_length
if [ "$kernel_length" ]; then
local ubi_kernel_length
if [ "$kernel_length" ]; then
local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
if [ "$rootfs_length" ]; then
local root_ubivol="$( nand_find_volume $ubidev "$CI_ROOTPART" )"
local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
if [ "$rootfs_length" ]; then
local root_ubivol="$( nand_find_volume $ubidev "$CI_ROOTPART" )"
- tar xf "$tar_file" "$board_dir/root" -O | \
- ubiupdatevol /dev/$root_ubivol -s $rootfs_length -
+ tar x${gz}f "$tar_file" "$board_dir/root" -O | \
+ ubiupdatevol /dev/$root_ubivol -s "$rootfs_length" -
fi
if [ "$kernel_length" ]; then
if [ "$kernel_mtd" ]; then
fi
if [ "$kernel_length" ]; then
if [ "$kernel_mtd" ]; then
- tar xf "$tar_file" "$board_dir/kernel" -O | \
+ tar x${gz}f "$tar_file" "$board_dir/kernel" -O | \
mtd write - "$CI_KERNPART"
else
local kern_ubivol="$( nand_find_volume $ubidev "$CI_KERNPART" )"
mtd write - "$CI_KERNPART"
else
local kern_ubivol="$( nand_find_volume $ubidev "$CI_KERNPART" )"
- tar xf "$tar_file" "$board_dir/kernel" -O | \
- ubiupdatevol /dev/$kern_ubivol -s $kernel_length -
+ tar x${gz}f "$tar_file" "$board_dir/kernel" -O | \
+ ubiupdatevol /dev/$kern_ubivol -s "$kernel_length" -
- local file_type=$(identify "$1")
+ local file="$1"
+
+ local gz="$(identify_if_gzip "$file")"
+ local file_type="$(identify "$file" "" "$gz")"
+
+ [ "$gz" = z ] && echo "detected compressed firmware file"
[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART=rootfs
case "$file_type" in
[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART=rootfs
case "$file_type" in
- "fit") nand_upgrade_fit "$1";;
- "ubi") nand_upgrade_ubinized "$1";;
- "ubifs") nand_upgrade_ubifs "$1";;
- *) nand_upgrade_tar "$1";;
+ "fit") nand_upgrade_fit "$file" "$gz";;
+ "ubi") nand_upgrade_ubinized "$file" "$gz";;
+ "ubifs") nand_upgrade_ubifs "$file" "$gz";;
+ *) nand_upgrade_tar "$file" "$gz";;
# Recognize type of passed file and start the upgrade process
nand_do_upgrade() {
# Recognize type of passed file and start the upgrade process
nand_do_upgrade() {
- if nand_do_flash_file "$1" && nand_do_restore_config && sync; then
+ if nand_do_flash_file "$file" && nand_do_restore_config && sync; then
echo "sysupgrade successful"
umount -a
reboot -f
echo "sysupgrade successful"
umount -a
reboot -f
# $(2): file to be checked
nand_do_platform_check() {
local board_name="$1"
# $(2): file to be checked
nand_do_platform_check() {
local board_name="$1"
- local tar_file="$2"
- local control_length=$( (tar xf $tar_file sysupgrade-$board_name/CONTROL -O | wc -c) 2> /dev/null)
- local file_type="$(identify $2)"
+ local file="$2"
+
+ local gz="$(identify_if_gzip "$file")"
+ local file_type="$(identify "$file" "" "$gz")"
- [ "$control_length" = 0 -a "$file_type" != "ubi" -a "$file_type" != "ubifs" -a "$file_type" != "fit" ] && {
- echo "Invalid sysupgrade file."
+ local control_length=$( (tar x${gz}f "$file" "sysupgrade-$board_name/CONTROL" -O | wc -c) 2> /dev/null)
+
+ if [ "$file_type" != "fit" -a "$file_type" != "ubi" -a "$file_type" != "ubifs" -a "$control_length" = 0 ]; then
+ echo "invalid sysupgrade file"