ath79: get rid of BOARD_NAME for Mikrotik RouterBOARD

[oweals/openwrt.git] / target / linux / ath79 / mikrotik / base-files / lib / upgrade / platform.sh

diff --git a/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh b/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh
index a5686895365287bab262ca583d262b956dc551c4..d2e43d404f9b794ed28f0b43ad830b8a6eff8d98 100644 (file)
--- a/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh
@@ -12,11 +12,17 @@ RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
 
 platform_do_upgrade_mikrotik_nand() {
        CI_KERNPART=none
+
        local fw_mtd=$(find_mtd_part kernel)
        fw_mtd="${fw_mtd/block/}"
        [ -n "$fw_mtd" ] || return
+
+       local board_dir=$(tar tf "$1" | grep -m 1 '^sysupgrade-.*/$')
+       board_dir=${board_dir%/}
+       [ -n "$board_dir" ] || return
+
        mtd erase kernel
-       tar xf "$1" sysupgrade-routerboard/kernel -O | nandwrite -o "$fw_mtd" -
+       tar xf "$1" ${board_dir}/kernel -O | nandwrite -o "$fw_mtd" -
 
        nand_do_upgrade "$1"
 }