From: Petr Štetiar <ynezz@true.cz>
Date: Tue, 16 Jul 2019 08:23:18 +0000 (+0200)
Subject: imx6: apalis: fix sysupgrade paths
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5e9a6d08d298502907e72e854e2a0514b3637527;p=openwrt%2Fstaging%2Fjow.git

imx6: apalis: fix sysupgrade paths

We can't use $board_name in sysupgrade paths for kernel and rootfs as we
currently generate one image which could be used on two different base
boards.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/target/linux/imx6/base-files/lib/upgrade/platform.sh b/target/linux/imx6/base-files/lib/upgrade/platform.sh
index c3be9d5424..aecdf6c4b1 100755
--- a/target/linux/imx6/base-files/lib/upgrade/platform.sh
+++ b/target/linux/imx6/base-files/lib/upgrade/platform.sh
@@ -23,12 +23,9 @@ apalis_copy_config() {
 }
 
 apalis_do_upgrade() {
-	local board_name=$(board_name)
-	board_name=${board_name/,/_}
-
 	apalis_mount_boot
-	get_image "$1" | tar Oxf - sysupgrade-${board_name}/kernel > /boot/uImage
-	get_image "$1" | tar Oxf - sysupgrade-${board_name}/root > $(rootpart_from_uuid)
+	get_image "$1" | tar Oxf - sysupgrade-apalis/kernel > /boot/uImage
+	get_image "$1" | tar Oxf - sysupgrade-apalis/root > $(rootpart_from_uuid)
 	sync
 	umount /boot
 }