From: Rafał Miłecki <rafal@milecki.pl>
Date: Wed, 17 Jul 2019 06:02:05 +0000 (+0200)
Subject: layerscape: sysupgrade: get rid of platform_pre_upgrade()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3b30ff29757258a0e16f51a86cdbb2a74a67ff7e;p=openwrt%2Fstaging%2Fldir.git

layerscape: sysupgrade: get rid of platform_pre_upgrade()

1) RAMFS_COPY_BIN and RAMFS_COPY_DATA can be defined at top of the file
   like it's done for all other targets.
2) fw_printenv.lock can be created one step later in the
   platform_do_upgrade(). It seems to be working well on many other
   targets.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/target/linux/layerscape/base-files/lib/upgrade/platform.sh b/target/linux/layerscape/base-files/lib/upgrade/platform.sh
index 3bbf6f3dc6..c7b9b06cfe 100644
--- a/target/linux/layerscape/base-files/lib/upgrade/platform.sh
+++ b/target/linux/layerscape/base-files/lib/upgrade/platform.sh
@@ -1,8 +1,11 @@
-
 #!/bin/sh
 #
 # Copyright 2015-2019 Traverse Technologies
 #
+
+RAMFS_COPY_BIN="/usr/sbin/fw_printenv /usr/sbin/fw_setenv /usr/sbin/ubinfo /bin/echo"
+RAMFS_COPY_DATA="/etc/fw_env.config /var/lock/fw_printenv.lock"
+
 platform_do_upgrade_traverse_nandubi() {
 	bootsys=$(fw_printenv bootsys | awk -F= '{{print $2}}')
 	newbootsys=2
@@ -39,6 +42,10 @@ platform_check_image() {
 platform_do_upgrade() {
 	local board=$(board_name)
 
+	# Force the creation of fw_printenv.lock
+	mkdir -p /var/lock
+	touch /var/lock/fw_printenv.lock
+
 	case "$board" in
 	traverse,ls1043v | \
 	traverse,ls1043s)
@@ -49,11 +56,3 @@ platform_do_upgrade() {
 		;;
 	esac
 }
-platform_pre_upgrade() {
-	# Force the creation of fw_printenv.lock
-	mkdir -p /var/lock
-	touch /var/lock/fw_printenv.lock
-
-	export RAMFS_COPY_BIN="/usr/sbin/fw_printenv /usr/sbin/fw_setenv /usr/sbin/ubinfo /bin/echo ${RAMFS_COPY_BIN}"
-	export RAMFS_COPY_DATA="/etc/fw_env.config /var/lock/fw_printenv.lock ${RAMFS_COPY_DATA}"
-}