ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-04-10 12:50:47 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ar71xx: Fix installation of fw_setenv in sysupgrade ramdisk

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, 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>
This commit is contained in:
Sven Eckelmann 2018-10-01 12:27:25 +02:00 committed by Mathias Kresin
parent 234b893a18
commit 95e2da8366
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
}

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

@ -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
}