Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update-firmware: squashsf: modify the logic to include the ro systems 

In a squashfs the mount points are different and the current logic
wasn't working.

It's more reliable to check the /proc/cmdline to determine if
the system is a nand or an emmc.

Added also logic to get the active partition in nand devices
when the rootfs is squashfs.

https://onedigi.atlassian.net/browse/DEL-8558

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
This commit is contained in:
Francisco Gil 2023-06-02 09:44:38 +02:00
parent 6a70b52356
commit 3d3ba69b08
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta-digi-dey/recipes-digi/dualboot/dualboot/update-firmware
View File

@ -32,8 +32,11 @@ UPDATE_FILE=""
ALT_BOOT="" ALT_BOOT=""
ALT_ROOTFS="" ALT_ROOTFS=""
# Check if the rootfs is ubifs to determine if it is a nand or emmc device # Check in the command line if root=PARTUUID to determine if the system is nand or emmc
NANDROOTFS="$(grep -qs '[[:blank:]]\+/[[:blank:]]\+ubifs.*' /proc/mounts 2>/dev/null && echo 1)" # eMMC ==> root=PARTUUID
# NAND ==> root=ubiX:rootfs_X
# NAND (squashsf) ==> root=/dev/ubiblock0_X
EMMCROOTFS="$(grep -qs 'root=PARTUUID.*' /proc/cmdline 2>/dev/null && echo 1)"
## Local functions ## Local functions
usage() { usage() {
@ -52,7 +55,23 @@ EOF
} }
get_active_system() { get_active_system() {
if [ -z "${NANDROOTFS}" ]; then if [ -z "${EMMCROOTFS}" ]; then
# For a read-only filesystem this will be /dev/ubiblock0_X
# For an ubifs filesystem this will be ubiX:rootfs_X
ACTIVE_SYSTEM="$(sed -e 's/^.*root=\([^ ]*\) .*$/\1/' /proc/cmdline 2>/dev/null)"
if ! echo "${ACTIVE_SYSTEM}" | grep -qs rootfs; then
# From /dev/ubiblock0_X to /dev/ubi0_X
ACTIVE_SYSTEM="/dev/ubi${ACTIVE_SYSTEM#/dev/ubiblock}"
#Volume ID: 5 (on ubi0)
#Type: dynamic
#Alignment: 1
#Size: 1817 LEBs (230715392 bytes, 220.0 MiB)
#State: OK
#Name: rootfs_b
#Character device major/minor: 242:6
ACTIVE_SYSTEM="$(ubinfo "${ACTIVE_SYSTEM}" | sed -ne '/^Name/s,.* \([^[:blank:]]\+\)$,\1,g;T;p')"
fi
else
local MMCROOT_DEV local MMCROOT_DEV
MMCROOT_DEV="$(stat -c%D /)" MMCROOT_DEV="$(stat -c%D /)"
@ -63,8 +82,6 @@ get_active_system() {
break break
fi fi
done done
else
ACTIVE_SYSTEM="$(sed -ne 's,^\([^[:blank:]]\+\)[[:blank:]]\+/[[:blank:]]\+ubifs.*,\1,g;T;p' /proc/mounts 2>/dev/null)"
fi fi
if [ -z "${ACTIVE_SYSTEM}" ]; then if [ -z "${ACTIVE_SYSTEM}" ]; then
@ -99,7 +116,11 @@ reboot_system() {
} }
swap_active_system() { swap_active_system() {
if [ -z "${NANDROOTFS}" ]; then if [ -z "${EMMCROOTFS}" ]; then
fw_setenv mtdbootpart ${ALT_BOOT}
fw_setenv mtdrootfspart ${ALT_ROOTFS}
fw_setenv rootfsvol ${ALT_ROOTFS}
else
local PART_UUID="" local PART_UUID=""
# Get boot and rootfs partition index # Get boot and rootfs partition index
@ -121,10 +142,7 @@ swap_active_system() {
fw_setenv mmcroot "PARTUUID=${PART_UUID}" fw_setenv mmcroot "PARTUUID=${PART_UUID}"
fw_setenv mmcpart "${MMC_PART}" fw_setenv mmcpart "${MMC_PART}"
else
fw_setenv mtdbootpart ${ALT_BOOT}
fw_setenv mtdrootfspart ${ALT_ROOTFS}
fw_setenv rootfsvol ${ALT_ROOTFS}
fi fi
fw_setenv active_system ${ALT_BOOT} fw_setenv active_system ${ALT_BOOT}
@ -173,7 +191,7 @@ update_device() {
show_active_system show_active_system
echo "Updating system on $(echo ${ALT_BOOT} | cut -d'_' -f2 | tr [:lower:] [:upper:])" echo "Updating system on $(echo ${ALT_BOOT} | cut -d'_' -f2 | tr [:lower:] [:upper:])"
if [ -z "${NANDROOTFS}" ]; then if [ -n "${EMMCROOTFS}" ]; then
update_emmc update_emmc
else else
update_nand update_nand