From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 16 Jan 2023 21:00:41 +0000 (+0000)
Subject: mediatek: mt7622: fix sysupgrade on MMC on BPi-R64
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=86a2dae29a7391f83a0b8d2f85828f72c834b17e;p=openwrt%2Fstaging%2Fblocktrron.git

mediatek: mt7622: fix sysupgrade on MMC on BPi-R64

A previous attempt to simplify things went wrong and now sysupgrade
is broken on this device. Fix that.

Fixes: d640cbac0e ("mediatek: mt7622: don't rely on existing image for sysupgrade")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
index e62eba7ef1..d3d503dd1e 100755
--- a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
@@ -8,6 +8,7 @@ platform_do_upgrade() {
 	bananapi,bpi-r64)
 		local rootdev="$(cmdline_get_var root)"
 		rootdev="${rootdev##*/}"
+		rootdev="${rootdev%p[0-9]*}"
 		case "$rootdev" in
 		mmc*)
 			CI_ROOTDEV="$rootdev"