ar71xx: Use sysupgrade's RAMFS_COPY_* for fw_(set|print)env

The install_bin from /lib/upgrade/common.sh is no longer creating the
symlinks when a secondary parameter is added. But the fw_setenv program was
always copied this way to the ramdisk for the upgrade.

Instead, this should be done using RAMFS_COPY_* like on all other
platforms.

Fixes: 438dcbfe74a6 ("base-files: automatically handle paths and symlinks for RAMFS_COPY_BIN")
Signed-off-by: Sven Eckelmann <[email protected]>
(backported from 11d51276b1b0ac6a556a776374ca3de07b062e29)

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh b/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
index c17024d127e6d5cd6b110332e22e8fa6902194ca..8aa2b123fbb47c33281e9106b02114b637c2b78b 100644 (file)
--- a/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
@@ -3,11 +3,10 @@
 # In case the check fails during boot, a failsafe-system is started to provide
 # a minimal web-interface for flashing a new firmware.
 
-# make sure we got uboot-envtools and fw_env.config copied over to the ramfs
 # create /var/lock for the lock "fw_setenv.lock" of fw_setenv
-platform_add_ramfs_ubootenv() {
-       [ -e /usr/sbin/fw_setenv ] && install_bin /usr/sbin/fw_setenv
-       [ -e /etc/fw_env.config ] && install_file /etc/fw_env.config
+# the rest is copied using ar71xx's RAMFS_COPY_BIN and RAMFS_COPY_DATA
+platform_add_ramfs_ubootenv()
+{
        mkdir -p $RAM_ROOT/var/lock
 }
 append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
index 650a6be6dc99a64cafa3becaca5b2defba9b759d..18958271745c190f61e81f4d13d651674eb9ce25 100644 (file)
--- a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
@@ -26,12 +26,10 @@ cfg_value_get()
                done
 }
 
-# make sure we got uboot-envtools and fw_env.config copied over to the ramfs
 # create /var/lock for the lock "fw_setenv.lock" of fw_setenv
+# the rest is copied using ar71xx's RAMFS_COPY_BIN and RAMFS_COPY_DATA
 platform_add_ramfs_ubootenv()
 {
-       [ -e /usr/sbin/fw_setenv ] && install_bin /usr/sbin/fw_setenv
-       [ -e /etc/fw_env.config ] && install_file /etc/fw_env.config
        mkdir -p $RAM_ROOT/var/lock
 }
 append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 3068aa4235582d6e8fa5e27d2ccaac6a9d3f8f44..e2d9aafec02cf25b6ee916dc4b27d6005b07cf4f 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -6,8 +6,8 @@
 . /lib/ar71xx.sh
 
 PART_NAME=firmware
-RAMFS_COPY_DATA=/lib/ar71xx.sh
-RAMFS_COPY_BIN='nandwrite'
+RAMFS_COPY_DATA='/lib/ar71xx.sh /etc/fw_env.config /var/lock/fw_printenv.lock'
+RAMFS_COPY_BIN='nandwrite fw_printenv fw_setenv'
 
 CI_BLKSZ=65536
 CI_LDADR=0x80060000