domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: 438dcbfe74 ("base-files: automatically handle paths and symlinks for RAMFS_COPY_BIN")
Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
This commit is contained in:
Sven Eckelmann
2018-10-01 12:27:25 +02:00
committed by Mathias Kresin
parent b09992a7d9
commit 11d51276b1
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
View File

@@ -3,11 +3,10 @@
# In case the check fails during boot, a failsafe-system is started to provide # In case the check fails during boot, a failsafe-system is started to provide
# a minimal web-interface for flashing a new firmware. # 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 # create /var/lock for the lock "fw_setenv.lock" of fw_setenv
platform_add_ramfs_ubootenv() { # the rest is copied using ar71xx's RAMFS_COPY_BIN and RAMFS_COPY_DATA
[ -e /usr/sbin/fw_printenv ] && install_bin /usr/sbin/fw_printenv /usr/sbin/fw_setenv platform_add_ramfs_ubootenv()
[ -e /etc/fw_env.config ] && install_file /etc/fw_env.config {
mkdir -p $RAM_ROOT/var/lock mkdir -p $RAM_ROOT/var/lock
} }
append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv

4
target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
View File

@@ -26,12 +26,10 @@ cfg_value_get()
done 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 # 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() platform_add_ramfs_ubootenv()
{ {
[ -e /usr/sbin/fw_printenv ] && install_bin /usr/sbin/fw_printenv /usr/sbin/fw_setenv
[ -e /etc/fw_env.config ] && install_file /etc/fw_env.config
mkdir -p $RAM_ROOT/var/lock mkdir -p $RAM_ROOT/var/lock
} }
append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv

4
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
View File

@@ -6,8 +6,8 @@
. /lib/ar71xx.sh . /lib/ar71xx.sh
PART_NAME=firmware PART_NAME=firmware
RAMFS_COPY_DATA=/lib/ar71xx.sh RAMFS_COPY_DATA='/lib/ar71xx.sh /etc/fw_env.config /var/lock/fw_printenv.lock'
RAMFS_COPY_BIN='nandwrite' RAMFS_COPY_BIN='nandwrite fw_printenv fw_setenv'
CI_BLKSZ=65536 CI_BLKSZ=65536
CI_LDADR=0x80060000 CI_LDADR=0x80060000