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: 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:
		
				
					committed by
					
						
						Mathias Kresin
					
				
			
			
				
	
			
			
			
						parent
						
							b09992a7d9
						
					
				
				
					commit
					11d51276b1
				
			@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user