From: Rafał Miłecki <ra...@milecki.pl>
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 <ra...@milecki.pl>
---
.../base-files/lib/upgrade/platform.sh | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/target/linux/layerscape/base-files/lib/upgrade/platform.sh
b/target/linux/layerscape/base-files/lib/upgrade/platform.sh
index 1c924997e6..8236a12bea 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}"
-}
--
2.21.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
