a53417cc30
The code can be made more efficient by not extracting the sysupgrade.tar but rather just querying for the filesize within the archive. Resorting to manual update of UBI volume is extra work too, setting CI_KERNPART=rootfs_0 is enough. Suggested-by: Andreas Gnau <andreas.gnau@iopsys.eu> Signed-off-by: Mauri Sandberg <maukka@ext.kapsi.fi> Link: https://github.com/openwrt/openwrt/pull/17806 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
38 lines
1.4 KiB
Bash
38 lines
1.4 KiB
Bash
#
|
|
# Copyright (C) 2023 Mauri Sandberg
|
|
#
|
|
|
|
# The vendor UBI is split in volumes 0-3. Volumes 0 and 1 contain U-Boot
|
|
# environments env1 and env2, respectively. The vendor root file systems
|
|
# are in volumes 2 (rootfs_0) and 3 (rootfs_1). Drop the two roots and
|
|
# explicitly use rootfs_0 as a boot partition that contains the dtb and the
|
|
# OpenWrt kernel. This is because the vendor U-Boot expects to find them there.
|
|
# Then continue upgrade with the default method - a SquashFS rootfs will be
|
|
# installed and the rest of UBI will be used as an overlay.
|
|
|
|
# The 'kernel' inside the sysupgrage.tar is an UBIFS image that contains
|
|
# /boot/dtb and /boot/kernel. The 'root' is an OpenWrt SquashFS root
|
|
|
|
. /lib/functions.sh
|
|
. /lib/upgrade/nand.sh
|
|
|
|
inteno_do_upgrade () {
|
|
# get the size of the new bootfs
|
|
local _bootfs_size=$(tar -tvf $1 | grep kernel | awk '{print $3}')
|
|
[ -n "$_bootfs_size" -a "$_bootfs_size" -gt "0" ] || nand_do_upgrade_failed
|
|
|
|
# remove existing rootfses and recreate rootfs_0
|
|
ubirmvol /dev/ubi0 --name=rootfs_0 > /dev/null 2>&1
|
|
ubirmvol /dev/ubi0 --name=rootfs_1 > /dev/null 2>&1
|
|
ubirmvol /dev/ubi0 --name=rootfs > /dev/null 2>&1
|
|
ubirmvol /dev/ubi0 --name=rootfs_data > /dev/null 2>&1
|
|
ubimkvol /dev/ubi0 --type=static --size=${_bootfs_size} --name=rootfs_0
|
|
|
|
fw_setenv root_vol rootfs_0
|
|
fw_setenv boot_cnt_primary 0
|
|
fw_setenv boot_cnt_alt 0
|
|
|
|
# proceed to upgrade the default way
|
|
CI_KERNPART=rootfs_0
|
|
nand_do_upgrade "$1"
|
|
}
|