[openwrt/openwrt] qualcommax: ipq807x: Remove OEM UBI volume before upgrade for Linksys MX devices

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/e301921ae383ebb81b33af59a802fb4ffdc14c0a

commit e301921ae383ebb81b33af59a802fb4ffdc14c0a
Author: Paweł Owoc <frut3k7 at gmail.com>
AuthorDate: Thu Jan 2 22:31:33 2025 +0100

    qualcommax: ipq807x: Remove OEM UBI volume before upgrade for Linksys MX devices
    
    Use 'remove_oem_ubi_volume' function to remove OEM UBI volume before upgrade.
    This allows to upgrade even if we have OEM firmware on the second partition.
    Applies to Linksys MX4200/MX4300/MX5300/MX8500.
    
    Signed-off-by: Paweł Owoc <frut3k7 at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/14720
    Link: https://github.com/openwrt/openwrt/pull/20086
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
index 3deb102a8f..438cfdc613 100644
--- a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
@@ -212,9 +212,13 @@ platform_do_upgrade() {
 		;;
 	linksys,mx4200v1|\
 	linksys,mx4200v2|\
-	linksys,mx4300|\
+	linksys,mx4300)
+		remove_oem_ubi_volume squashfs
+		linksys_mx_do_upgrade "$1"
+		;;
 	linksys,mx5300|\
 	linksys,mx8500)
+		remove_oem_ubi_volume ubifs
 		linksys_mx_do_upgrade "$1"
 		;;
 	prpl,haze|\