[openwrt/openwrt] ipq807x: delete unused legacy eMMC sysupgrade code

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 28 10:57:56 PST 2024


ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/05989f69d8e68051bc2058f0ae3b2e14264a4504

commit 05989f69d8e68051bc2058f0ae3b2e14264a4504
Author: Rodrigo Balerdi <lanchon at gmail.com>
AuthorDate: Fri Nov 8 17:40:29 2024 -0300

    ipq807x: delete unused legacy eMMC sysupgrade code
    
    All ipq807x devices that were using the legacy 'mmc_do_upgrade' eMMC
    sysupgrade code were ported to the replacement 'emmc_do_upgrade' code.
    
    Signed-off-by: Rodrigo Balerdi <lanchon at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/16505
    Signed-off-by: Robert Marko <robimarko at gmail.com>
    (cherry picked from commit 491121288eaa9d20f3db8215a4790e8f0ee1f8ca)
    Link: https://github.com/openwrt/openwrt/pull/17097
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 .../ipq807x/base-files/lib/upgrade/mmc.sh          | 83 ----------------------
 1 file changed, 83 deletions(-)

diff --git a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh
deleted file mode 100644
index 21cd7928e3..0000000000
--- a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Copyright (C) 2016 lede-project.org
-#
-
-# this can be used as a generic mmc upgrade script
-# just add a device entry in platform.sh, 
-# define "kernelname" and "rootfsname" and call mmc_do_upgrade
-# after the kernel and rootfs flash a loopdev (as overlay) is 
-# setup on top of the rootfs partition
-# for the proper function a padded rootfs image is needed, basically 
-# append "pad-to 64k" to the image definition
-# this is based on the ipq806x zyxel.sh mmc upgrade
-
-. /lib/functions.sh
-
-mmc_do_upgrade() {
-	local tar_file="$1"
-	local rootfs=
-	local kernel=
-
-	[ -z "$kernel" ] && kernel=$(find_mmc_part ${kernelname})
-	[ -z "$rootfs" ] && rootfs=$(find_mmc_part ${rootfsname})
-
-	[ -z "$kernel" ] && echo "Upgrade failed: kernel partition not found! Rebooting..." && reboot -f
-	[ -z "$rootfs" ] && echo "Upgrade failed: rootfs partition not found! Rebooting..." && reboot -f
-
-	mmc_do_flash $tar_file $kernel $rootfs
-
-	return 0
-}
-
-mmc_do_flash() {
-	local tar_file=$1
-	local kernel=$2
-	local rootfs=$3
-	
-	# keep sure its unbound
-	losetup --detach-all || {
-		echo Failed to detach all loop devices. Skip this try.
-		reboot -f
-	}
-
-	# use the first found directory in the tar archive
-	local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$')
-	board_dir=${board_dir%/}
-
-	echo "flashing kernel to $kernel"
-	tar xf $tar_file ${board_dir}/kernel -O >$kernel
-
-	echo "flashing rootfs to ${rootfs}"
-	tar xf $tar_file ${board_dir}/root -O >"${rootfs}"
-
-	# a padded rootfs is needed for overlay fs creation
-	local offset=$(tar xf $tar_file ${board_dir}/root -O | wc -c)
-	[ $offset -lt 65536 ] && {
-		echo Wrong size for rootfs: $offset
-		sleep 10
-		reboot -f
-	}
-
-	# Mount loop for rootfs_data
-	local loopdev="$(losetup -f)"
-	losetup -o $offset $loopdev $rootfs || {
-		echo "Failed to mount looped rootfs_data."
-		sleep 10
-		reboot -f
-	}
-
-	echo "Format new rootfs_data at position ${offset}."
-	mkfs.ext4 -F -L rootfs_data $loopdev
-	mkdir /tmp/new_root
-	mount -t ext4 $loopdev /tmp/new_root && {
-		echo "Saving config to rootfs_data at position ${offset}."
-		cp -v "$UPGRADE_BACKUP" "/tmp/new_root/$BACKUP_FILE"
-		umount /tmp/new_root
-	}
-
-	# Cleanup
-	losetup -d $loopdev >/dev/null 2>&1
-	sync
-	umount -a
-	reboot -f
-}




More information about the lede-commits mailing list