aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorSven Eckelmann <sven.eckelmann@openmesh.com>2018-10-01 12:27:25 +0200
committerMathias Kresin <dev@kresin.me>2018-10-07 16:42:05 +0200
commit95e2da836688469924df07f0009a94098e9c75fa (patch)
tree62ff11dbf2e6553037f7afc6847fbd5b3fa922be /target
parent234b893a18a034e4ce7a07ae6264525bad949e82 (diff)
downloadupstream-95e2da836688469924df07f0009a94098e9c75fa.tar.gz
upstream-95e2da836688469924df07f0009a94098e9c75fa.tar.bz2
upstream-95e2da836688469924df07f0009a94098e9c75fa.zip
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>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/base-files/lib/upgrade/allnet.sh6
-rw-r--r--target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh6
2 files changed, 6 insertions, 6 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..c17024d127 100644
--- 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 6085b300a0..650a6be6dc 100644
--- 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
}