EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mvebu: sysupgrade: fix uDPU eMMC check regression

Browse Source 
Add udpu_ prefix in all other function names

Signed-off-by: Vladimir Vid <vladimir.vid@sartura.hr>
This commit is contained in:
Vladimir Vid 2019-08-29 17:26:12 +02:00 committed by Luka Perkov
parent 055abe902b
commit bec2df9a66
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
target/linux/mvebu/base-files/lib/upgrade/uDPU.sh
View File

@ -1,3 +1,4 @@
udpu_check_emmc() {
# uDPU uses combined ext4 and f2fs partitions. # uDPU uses combined ext4 and f2fs partitions.
# partition layout: # partition layout:
# 1. boot (ext4) # 1. boot (ext4)
@ -5,17 +6,18 @@
# 3. rootfs (f2fs) # 3. rootfs (f2fs)
# 4. misc (f2fs) # 4. misc (f2fs)
# Check which device is available, depending on the board revision # Check which device is available, depending on the board revision
if [ -b "/dev/mmcblk1" ]; then if [ -b "/dev/mmcblk1" ]; then
emmc_dev=/dev/mmcblk1 emmc_dev=/dev/mmcblk1
elif [ -b "/dev/mmcblk0" ]; then elif [ -b "/dev/mmcblk0" ]; then
emmc_dev=/dev/mmcblk0 emmc_dev=/dev/mmcblk0
else else
echo "Cannot detect eMMC flash, aborting.." echo "Cannot detect eMMC flash, aborting.."
exit 1 exit 1
fi fi
}
part_prep() { udpu_part_prep() {
if [ "$(grep $1 /proc/mounts)" ]; then if [ "$(grep $1 /proc/mounts)" ]; then
mounted_part="$(grep $1 /proc/mounts | awk '{print $2}' | head -1)" mounted_part="$(grep $1 /proc/mounts | awk '{print $2}' | head -1)"
umount $mounted_part umount $mounted_part
@ -23,7 +25,7 @@ part_prep() {
fi fi
} }
do_part_check() { udpu_do_part_check() {
local emmc_parts="1 2 3 4" local emmc_parts="1 2 3 4"
local part_valid="1" local part_valid="1"
@ -39,17 +41,17 @@ do_part_check() {
# Format the /misc part right away as we will need it for the firmware # Format the /misc part right away as we will need it for the firmware
printf "Formating /misc partition, this make take a while..\n" printf "Formating /misc partition, this make take a while..\n"
part_prep ${emmc_dev}p4 udpu_part_prep ${emmc_dev}p4
mkfs.f2fs -q -l misc ${emmc_dev}p4 mkfs.f2fs -q -l misc ${emmc_dev}p4
[ $? -eq 0 ] && printf "/misc partition formated successfully\n" || printf "/misc partition formatting failed\n" [ $? -eq 0 ] && printf "/misc partition formated successfully\n" || printf "/misc partition formatting failed\n"
do_initial_setup udpu_do_initial_setup
else else
printf "Partition table looks ok\n" printf "Partition table looks ok\n"
fi fi
} }
do_misc_prep() { udpu_do_misc_prep() {
if [ ! "$(grep -wo /misc /proc/mounts)" ]; then if [ ! "$(grep -wo /misc /proc/mounts)" ]; then
mkdir -p /misc mkdir -p /misc
mount ${emmc_dev}p4 /misc mount ${emmc_dev}p4 /misc
@ -61,7 +63,7 @@ do_misc_prep() {
format_count=0 format_count=0
while [ "$format_count" -lt "1" ]; do while [ "$format_count" -lt "1" ]; do
part_prep ${emmc_dev}p4 udpu_part_prep ${emmc_dev}p4
mkfs.f2fs -q -l misc ${emmc_dev}p4 mkfs.f2fs -q -l misc ${emmc_dev}p4
mount ${emmc_dev}p4 /misc mount ${emmc_dev}p4 /misc
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -77,23 +79,23 @@ do_misc_prep() {
fi fi
} }
do_initial_setup() { udpu_do_initial_setup() {
# Prepare /recovery parition # Prepare /recovery parition
part_prep ${emmc_dev}p2 udpu_part_prep ${emmc_dev}p2
mkfs.ext4 -q ${emmc_dev}p2 | echo y &> /dev/null mkfs.ext4 -q ${emmc_dev}p2 | echo y &> /dev/null
# Prepare /boot partition # Prepare /boot partition
part_prep ${emmc_dev}p1 udpu_part_prep ${emmc_dev}p1
mkfs.ext4 -q ${emmc_dev}p1 | echo y &> /dev/null mkfs.ext4 -q ${emmc_dev}p1 | echo y &> /dev/null
# Prepare /root partition # Prepare /root partition
printf "Formating /root partition, this may take a while..\n" printf "Formating /root partition, this may take a while..\n"
part_prep ${emmc_dev}p3 udpu_part_prep ${emmc_dev}p3
mkfs.f2fs -q -l rootfs ${emmc_dev}p3 mkfs.f2fs -q -l rootfs ${emmc_dev}p3
[ $? -eq 0 ] && printf "/root partition reformated\n" [ $? -eq 0 ] && printf "/root partition reformated\n"
} }
do_regular_upgrade() { udpu_do_regular_upgrade() {
# Clean /boot partition - mfks.ext4 is not available in chroot # Clean /boot partition - mfks.ext4 is not available in chroot
[ "$(grep -wo /boot /proc/mounts)" ] && umount /boot [ "$(grep -wo /boot /proc/mounts)" ] && umount /boot
mkdir -p /tmp/boot mkdir -p /tmp/boot
@ -108,14 +110,16 @@ do_regular_upgrade() {
} }
platform_do_upgrade_uDPU() { platform_do_upgrade_uDPU() {
udpu_check_emmc
# Prepare and extract firmware on /misc partition # Prepare and extract firmware on /misc partition
do_misc_prep udpu_do_misc_prep
[ -f "/misc/firmware" ] && rm -r /misc/firmware [ -f "/misc/firmware" ] && rm -r /misc/firmware
mkdir -p /misc/firmware mkdir -p /misc/firmware
tar xzf "$1" -C /misc/firmware/ tar xzf "$1" -C /misc/firmware/
do_regular_upgrade udpu_do_regular_upgrade
printf "Updating /boot partition\n" printf "Updating /boot partition\n"
tar xzf /misc/firmware/boot.tgz -C /tmp/boot tar xzf /misc/firmware/boot.tgz -C /tmp/boot