mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	allow overriding the kernel partition's name
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 41646
This commit is contained in:
		
							parent
							
								
									26a4bdc5cf
								
							
						
					
					
						commit
						ecb68ba6b4
					
				@ -4,6 +4,9 @@
 | 
			
		||||
 | 
			
		||||
. /lib/functions.sh
 | 
			
		||||
 | 
			
		||||
# 'kernel' partition on NAND contains the kernel
 | 
			
		||||
CI_KERNPART="kernel"
 | 
			
		||||
 | 
			
		||||
# 'ubi' partition on NAND contains UBI
 | 
			
		||||
CI_UBIPART="ubi"
 | 
			
		||||
 | 
			
		||||
@ -221,7 +224,7 @@ nand_upgrade_ubifs() {
 | 
			
		||||
nand_upgrade_tar() {
 | 
			
		||||
	local tar_file="$1"
 | 
			
		||||
	local board_name="$(cat /tmp/sysinfo/board_name)"
 | 
			
		||||
	local kernel_mtd="$(find_mtd_index kernel)"
 | 
			
		||||
	local kernel_mtd="$(find_mtd_index $CI_KERNPART)"
 | 
			
		||||
 | 
			
		||||
	local kernel_length=`(tar xf $tar_file sysupgrade-$board_name/kernel -O | wc -c) 2> /dev/null`
 | 
			
		||||
	local rootfs_length=`(tar xf $tar_file sysupgrade-$board_name/root -O | wc -c) 2> /dev/null`
 | 
			
		||||
@ -232,7 +235,7 @@ nand_upgrade_tar() {
 | 
			
		||||
	local has_env=0
 | 
			
		||||
 | 
			
		||||
	[ "kernel_length" = 0 -o -z "$kernel_mtd" ] || {
 | 
			
		||||
		tar xf $tar_file sysupgrade-$board_name/kernel -O | mtd write - kernel
 | 
			
		||||
		tar xf $tar_file sysupgrade-$board_name/kernel -O | mtd write - $CI_KERNPART
 | 
			
		||||
	}
 | 
			
		||||
	[ "kernel_length" = 0 -o ! -z "$kernel_mtd" ] && has_kernel=0
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user