diff options
| author | Sven Eckelmann <sven.eckelmann@openmesh.com> | 2018-10-01 12:27:25 +0200 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-10-07 15:44:19 +0200 |
| commit | 11d51276b1b0ac6a556a776374ca3de07b062e29 (patch) | |
| tree | b05a5a078aebe5c88485690844737e3c9c28e7c6 /target/linux/ar71xx/base-files/lib/upgrade | |
| parent | b09992a7d912005050db22e6034f6342534753b0 (diff) | |
| download | upstream-11d51276b1b0ac6a556a776374ca3de07b062e29.tar.gz upstream-11d51276b1b0ac6a556a776374ca3de07b062e29.tar.bz2 upstream-11d51276b1b0ac6a556a776374ca3de07b062e29.zip | |
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 <sven.eckelmann@openmesh.com>
Diffstat (limited to 'target/linux/ar71xx/base-files/lib/upgrade')
| -rw-r--r-- | target/linux/ar71xx/base-files/lib/upgrade/allnet.sh | 7 | ||||
| -rw-r--r-- | target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh | 4 | ||||
| -rwxr-xr-x | target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh b/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh index 98b368d150..c55e7bc062 100644 --- 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_printenv ] && install_bin /usr/sbin/fw_printenv /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 6085b300a0..e24a659026 100644 --- 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_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 } 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 3068aa4235..e2d9aafec0 100755 --- 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 |