ar71xx: Fix installation of fw_setenv in sysupgrade ramdisk

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, just install fw_setenv and let install_bin handle the detection of
the required dependencies.

Fixes: 438dcbfe74a6 ("base-files: automatically handle paths and symlinks for RAMFS_COPY_BIN")
Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh b/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
index 98b368d15055f1864f1a60582cac3a8732973326..c17024d127e6d5cd6b110332e22e8fa6902194ca 100644 (file)
--- a/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
@@ -6,7 +6,7 @@
 # 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_printenv ] && install_bin /usr/sbin/fw_printenv /usr/sbin/fw_setenv
+       [ -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
 }
@@ -71,8 +71,8 @@ platform_get_offset() {
 }
 
 platform_check_image_allnet() {
-       local fw_printenv=/usr/sbin/fw_printenv
-       [ ! -n "$fw_printenv" -o ! -x "$fw_printenv" ] && {
+       local fw_setenv=/usr/sbin/fw_setenv
+       [ ! -n "$fw_setenv" -o ! -x "$fw_setenv" ] && {
                echo "Please install uboot-envtools!"
                return 1
        }

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
index 6085b300a00ffc1bb32d3e6a6b4ed4e155906cd6..650a6be6dc99a64cafa3becaca5b2defba9b759d 100644 (file)
--- a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
@@ -30,7 +30,7 @@ cfg_value_get()
 # create /var/lock for the lock "fw_setenv.lock" of fw_setenv
 platform_add_ramfs_ubootenv()
 {
-       [ -e /usr/sbin/fw_printenv ] && install_bin /usr/sbin/fw_printenv /usr/sbin/fw_setenv
+       [ -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
 }
@@ -100,7 +100,7 @@ platform_check_image_openmesh()
 {
        local img_magic=$1
        local img_path=$2
-       local fw_printenv=/usr/sbin/fw_printenv
+       local fw_setenv=/usr/sbin/fw_setenv
        local img_board_target= img_num_files= i=0
        local cfg_name= kernel_name= rootfs_name=
 
@@ -144,7 +144,7 @@ platform_check_image_openmesh()
                return 1
        }
 
-       [ ! -x "$fw_printenv" ] && {
+       [ ! -x "$fw_setenv" ] && {
                echo "Please install uboot-envtools!"
                return 1
        }