Switch to OpenWrt 18.06 branch

patches/lede/0015-base-files-always-use-staged-sysupgrade.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 22 Apr 2017 00:54:50 +0200
-Subject: base-files: always use staged sysupgrade
-
-Support for the -d and -p options is dropped; it may be added again at some
-point by adding these flags to the ubus sysupgrade call.
-
-A downside of this is that we get a lot less information about the progress
-of the upgrade: as soon as the actual upgrade starts, all shell sessions
-are killed to allow unmounting the root filesystem.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
-index 8c1b3b180e1ecfdd2c106dd3b8853cd487ff89b4..ef9aac709fc1619ba15eeb0aeb4a9a6a372369b2 100644
---- a/package/base-files/files/lib/upgrade/common.sh
-+++ b/package/base-files/files/lib/upgrade/common.sh
-@@ -56,7 +56,6 @@ run_ramfs() { # <command> [...]
- 		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
- 		/bin/mknod
- 
--	install_bin /bin/uclient-fetch /bin/wget
- 	install_bin /sbin/mtd
- 	install_bin /sbin/mount_root
- 	install_bin /sbin/snapshot
-@@ -96,51 +95,37 @@ run_ramfs() { # <command> [...]
- 	exec /bin/busybox ash -c "$*"
- }
- 
--kill_remaining() { # [ <signal> ]
-+kill_remaining() { # [ <signal> [ <loop> ] ]
- 	local sig="${1:-TERM}"
-+	local loop="${2:-0}"
-+	local run=true
-+	local stat
-+
- 	echo -n "Sending $sig to remaining processes ... "
- 
--	local my_pid=$$
--	local my_ppid=$(cut -d' ' -f4  /proc/$my_pid/stat)
--	local my_ppisupgraded=
--	grep -q upgraded /proc/$my_ppid/cmdline >/dev/null && {
--		local my_ppisupgraded=1
--	}
--	
--	local stat
--	for stat in /proc/[0-9]*/stat; do
--		[ -f "$stat" ] || continue
--
--		local pid name state ppid rest
--		read pid name state ppid rest < $stat
--		name="${name#(}"; name="${name%)}"
--
--		local cmdline
--		read cmdline < /proc/$pid/cmdline
--
--		# Skip kernel threads
--		[ -n "$cmdline" ] || continue
--
--		if [ $$ -eq 1 ] || [ $my_ppid -eq 1 ] && [ -n "$my_ppisupgraded" ]; then
--			# Running as init process, kill everything except me
--			if [ $pid -ne $$ ] && [ $pid -ne $my_ppid ]; then
--				echo -n "$name "
--				kill -$sig $pid 2>/dev/null
--			fi
--		else 
--			case "$name" in
--				# Skip essential services
--				*procd*|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*|*nas*|*relayd*) : ;;
--
--				# Killable process
--				*)
--					if [ $pid -ne $$ ] && [ $ppid -ne $$ ]; then
--						echo -n "$name "
--						kill -$sig $pid 2>/dev/null
--					fi
--				;;
--			esac
--		fi
-+	while $run; do
-+		run=false
-+		for stat in /proc/[0-9]*/stat; do
-+			[ -f "$stat" ] || continue
-+
-+			local pid name state ppid rest
-+			read pid name state ppid rest < $stat
-+			name="${name#(}"; name="${name%)}"
-+
-+			# Skip PID1, ourself and our children
-+			[ $pid -ne 1 -a $pid -ne $$ -a $ppid -ne $$ ] || continue
-+
-+			local cmdline
-+			read cmdline < /proc/$pid/cmdline
-+
-+			# Skip kernel threads
-+			[ -n "$cmdline" ] || continue
-+
-+			echo -n "$name "
-+			kill -$sig $pid 2>/dev/null
-+
-+			[ $loop -eq 1 ] && run=true
-+		done
- 	done
- 	echo ""
- }
-@@ -175,28 +160,31 @@ v() {
- 	[ "$VERBOSE" -ge 1 ] && echo "$@"
- }
- 
-+json_string() {
-+	local v="$1"
-+	v="${v//\\/\\\\}"
-+	v="${v//\"/\\\"}"
-+	echo "\"$v\""
-+}
-+
- rootfs_type() {
- 	/bin/mount | awk '($3 ~ /^\/$/) && ($5 !~ /rootfs/) { print $5 }'
- }
- 
- get_image() { # <source> [ <command> ]
- 	local from="$1"
--	local conc="$2"
--	local cmd
--
--	case "$from" in
--		http://*|ftp://*) cmd="wget -O- -q";;
--		*) cmd="cat";;
--	esac
--	if [ -z "$conc" ]; then
--		local magic="$(eval $cmd \"$from\" 2>/dev/null | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
-+	local cat="$2"
-+
-+	if [ -z "$cat" ]; then
-+		local magic="$(dd if="$from" bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
- 		case "$magic" in
--			1f8b) conc="zcat";;
--			425a) conc="bzcat";;
-+			1f8b) cat="zcat";;
-+			425a) cat="bzcat";;
-+			*) cat="cat";;
- 		esac
- 	fi
- 
--	eval "$cmd \"$from\" 2>/dev/null ${conc:+| $conc}"
-+	$cat "$from" 2>/dev/null
- }
- 
- get_magic_word() {
-@@ -331,12 +319,14 @@ default_do_upgrade() {
- 	fi
- }
- 
--do_upgrade() {
-+do_upgrade_stage2() {
- 	v "Performing system upgrade..."
--	if type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
--		platform_do_upgrade "$ARGV"
-+	if [ -n "$do_upgrade" ]; then
-+		$do_upgrade "$IMAGE"
-+	elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
-+		platform_do_upgrade "$IMAGE"
- 	else
--		default_do_upgrade "$ARGV"
-+		default_do_upgrade "$IMAGE"
- 	fi
- 
- 	if [ "$SAVE_CONFIG" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then
-@@ -344,12 +334,11 @@ do_upgrade() {
- 	fi
- 
- 	v "Upgrade completed"
--	[ -n "$DELAY" ] && sleep "$DELAY"
--	ask_bool 1 "Reboot" && {
--		v "Rebooting system..."
--		umount -a
--		reboot -f
--		sleep 5
--		echo b 2>/dev/null >/proc/sysrq-trigger
--	}
-+	sleep 1
-+
-+	v "Rebooting system..."
-+	umount -a
-+	reboot -f
-+	sleep 5
-+	echo b 2>/dev/null >/proc/sysrq-trigger
- }
-diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
-index 6bd2005344c081df20e5a330a69e49e37225c39f..1e69c8f9657b39adf2a2c33bd9bac9303bcbc3d7 100644
---- a/package/base-files/files/lib/upgrade/nand.sh
-+++ b/package/base-files/files/lib/upgrade/nand.sh
-@@ -283,7 +283,16 @@ nand_upgrade_tar() {
- }
- 
- # Recognize type of passed file and start the upgrade process
--nand_do_upgrade_stage2() {
-+nand_do_upgrade() {
-+	if [ -n "$IS_PRE_UPGRADE" ]; then
-+		# Previously, nand_do_upgrade was called from the platform_pre_upgrade
-+		# hook; this piece of code handles scripts that haven't been
-+		# updated. All scripts should gradually move to call nand_do_upgrade
-+		# from platform_do_upgrade instead.
-+		export do_upgrade=nand_do_upgrade
-+		return
-+	fi
-+
- 	local file_type=$(identify $1)
- 
- 	if type 'platform_nand_pre_upgrade' >/dev/null 2>/dev/null; then
-@@ -299,45 +308,6 @@ nand_do_upgrade_stage2() {
- 	esac
- }
- 
--nand_upgrade_stage2() {
--	[ $1 = "nand" ] && {
--		[ -f "$2" ] && {
--			touch /tmp/sysupgrade
--
--			killall -9 telnetd
--			killall -9 dropbear
--			killall -9 ash
--
--			kill_remaining TERM
--			sleep 3
--			kill_remaining KILL
--
--			sleep 1
--
--			if [ -n "$(rootfs_type)" ]; then
--				v "Switching to ramdisk..."
--				run_ramfs ". /lib/functions.sh; include /lib/upgrade; nand_do_upgrade_stage2 $2"
--			else
--				nand_do_upgrade_stage2 $2
--			fi
--			return 0
--		}
--		echo "Nand upgrade failed"
--		exit 1
--	}
--}
--
--nand_upgrade_stage1() {
--	[ -f /tmp/sysupgrade-nand-path ] && {
--		path="$(cat /tmp/sysupgrade-nand-path)"
--		[ "$SAVE_CONFIG" != 1 -a -f "$CONF_TAR" ] &&
--			rm $CONF_TAR
--
--		ubus call system nandupgrade "{\"prefix\": \"$RAM_ROOT\", \"path\": \"$path\" }"
--		exit 0
--	}
--}
--
- # Check if passed file is a valid one for NAND sysupgrade. Currently it accepts
- # 3 types of files:
- # 1) UBI - should contain an ubinized image, header is checked for the proper
-@@ -364,13 +334,3 @@ nand_do_platform_check() {
- 
- 	return 0
- }
--
--# Start NAND upgrade process
--#
--# $(1): file to be used for upgrade
--nand_do_upgrade() {
--	echo -n $1 > /tmp/sysupgrade-nand-path
--	install_bin /sbin/upgraded
--	ln -s "$RAM_ROOT"/sbin/upgraded /tmp/upgraded
--	nand_upgrade_stage1
--}
-diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
-new file mode 100755
-index 0000000000000000000000000000000000000000..4e2aa3a23c3bab07a795762a30a4d4f701081934
---- /dev/null
-+++ b/package/base-files/files/lib/upgrade/stage2
-@@ -0,0 +1,50 @@
-+#!/bin/sh
-+
-+. /lib/functions.sh
-+. /lib/functions/system.sh
-+
-+export IMAGE="$1"
-+COMMAND="$2"
-+
-+export ARGV="$IMAGE"
-+export ARGC=1
-+
-+export SAVE_CONFIG=1
-+export SAVE_PARTITIONS=1
-+
-+export INTERACTIVE=0
-+export VERBOSE=1
-+export CONFFILES=/tmp/sysupgrade.conffiles
-+export CONF_TAR=/tmp/sysupgrade.tgz
-+
-+
-+[ -f "$CONF_TAR" ] || export SAVE_CONFIG=0
-+[ -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap ] && export SAVE_PARTITIONS=0
-+
-+include /lib/upgrade
-+
-+
-+killall -9 telnetd
-+killall -9 dropbear
-+killall -9 ash
-+
-+kill_remaining TERM
-+sleep 3
-+kill_remaining KILL 1
-+
-+sleep 1
-+
-+
-+if [ -n "$IMAGE" ] && type 'platform_pre_upgrade' >/dev/null 2>/dev/null; then
-+	IS_PRE_UPGRADE=1 platform_pre_upgrade "$IMAGE"
-+
-+	# Needs to be unset again because of busybox weirdness ...
-+	IS_PRE_UPGRADE=
-+fi
-+
-+if [ -n "$(rootfs_type)" ]; then
-+	echo "Switching to ramdisk..."
-+	run_ramfs "$COMMAND"
-+else
-+	exec /bin/busybox ash -c "$COMMAND"
-+fi
-diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
-index 71c7faa6dbc485ff33e776ff087e1aca58cfb0b0..fa08f4194daa0ee74758b9f49a23fe8dcb4b933d 100755
---- a/package/base-files/files/sbin/sysupgrade
-+++ b/package/base-files/files/sbin/sysupgrade
-@@ -1,4 +1,7 @@
- #!/bin/sh
-+
-+[ "$1" = "nand" ] && exec /lib/upgrade/stage2 "$2" "$3"
-+
- . /lib/functions.sh
- . /lib/functions/system.sh
- 
-@@ -11,7 +14,6 @@ export VERBOSE=1
- export SAVE_CONFIG=1
- export SAVE_OVERLAY=0
- export SAVE_PARTITIONS=1
--export DELAY=
- export CONF_IMAGE=
- export CONF_BACKUP_LIST=0
- export CONF_BACKUP=
-@@ -25,7 +27,6 @@ export TEST=0
- while [ -n "$1" ]; do
- 	case "$1" in
- 		-i) export INTERACTIVE=1;;
--		-d) export DELAY="$2"; shift;;
- 		-v) export VERBOSE="$(($VERBOSE + 1))";;
- 		-q) export VERBOSE="$(($VERBOSE - 1))";;
- 		-n) export SAVE_CONFIG=0;;
-@@ -50,10 +51,9 @@ done
- export CONFFILES=/tmp/sysupgrade.conffiles
- export CONF_TAR=/tmp/sysupgrade.tgz
- 
--export ARGV="$*"
--export ARGC="$#"
-+IMAGE="$1"
- 
--[ -z "$ARGV" -a -z "$NEED_IMAGE" -o $HELP -gt 0 ] && {
-+[ -z "$IMAGE" -a -z "$NEED_IMAGE" -o $HELP -gt 0 ] && {
- 	cat <<EOF
- Usage: $0 [<upgrade-option>...] <image file or URL>
-        $0 [-q] [-i] <backup-command> <file>
-@@ -90,7 +90,7 @@ EOF
- 	exit 1
- }
- 
--[ -n "$ARGV" -a -n "$NEED_IMAGE" ] && {
-+[ -n "$IMAGE" -a -n "$NEED_IMAGE" ] && {
- 	cat <<-EOF
- 		-b|--create-backup and -r|--restore-backup do not perform a firmware upgrade.
- 		Do not specify both -b|-r and a firmware image.
-@@ -155,14 +155,13 @@ sysupgrade_pre_upgrade="fwtool_pre_upgrade"
- 
- include /lib/upgrade
- 
--[ "$1" = "nand" ] && nand_upgrade_stage2 $@
--
- do_save_conffiles() {
- 	local conf_tar="${1:-$CONF_TAR}"
- 
- 	[ -z "$(rootfs_type)" ] && {
- 		echo "Cannot save config while running from ramdisk."
- 		ask_bool 0 "Abort" && exit
-+		rm -f "$conf_tar"
- 		return 0
- 	}
- 	run_hooks "$CONFFILES" $sysupgrade_init_conffiles
-@@ -203,8 +202,33 @@ type platform_check_image >/dev/null 2>/dev/null || {
- 	exit 1
- }
- 
-+case "$IMAGE" in
-+	http://*)
-+		wget -O/tmp/sysupgrade.img "$IMAGE"
-+		IMAGE=/tmp/sysupgrade.img
-+		;;
-+esac
-+
-+IMAGE="$(readlink -f "$IMAGE")"
-+
-+case "$IMAGE" in
-+	'')
-+		echo "Image file not found."
-+		exit 1
-+		;;
-+	/tmp/*)	;;
-+	*)
-+		v "Image not in /tmp, copying..."
-+		cp -f "$IMAGE" /tmp/sysupgrade.img
-+		IMAGE=/tmp/sysupgrade.img
-+		;;
-+esac
-+
-+export ARGV="$IMAGE"
-+export ARGC=1
-+
- for check in $sysupgrade_image_check; do
--	( eval "$check \"\$ARGV\"" ) || {
-+	( $check "$IMAGE" ) || {
- 		if [ $FORCE -eq 1 ]; then
- 			echo "Image check '$check' failed but --force given - will update anyway!"
- 			break
-@@ -230,6 +254,7 @@ elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
- 	[ $TEST -eq 1 ] || do_save_conffiles
- 	export SAVE_CONFIG=1
- else
-+	[ $TEST -eq 1 ] || rm -f "$CONF_TAR"
- 	export SAVE_CONFIG=0
- fi
- 
-@@ -237,28 +262,18 @@ if [ $TEST -eq 1 ]; then
- 	exit 0
- fi
- 
--run_hooks "" $sysupgrade_pre_upgrade
--
--# Some platforms/devices may want different sysupgrade process, e.g. without
--# killing processes yet or calling ubus system upgrade method.
--# This is needed e.g. on NAND devices where we just want to trigger stage1 at
--# this point.
--if type 'platform_pre_upgrade' >/dev/null 2>/dev/null; then
--	platform_pre_upgrade "$ARGV"
-+if [ $SAVE_PARTITIONS -eq 0 ]; then
-+	touch /tmp/sysupgrade.always.overwrite.bootdisk.partmap
-+else
-+	rm -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap
- fi
- 
--ubus call system upgrade
--touch /tmp/sysupgrade
--
--if [ ! -f /tmp/failsafe ] ; then
--	kill_remaining TERM
--	sleep 3
--	kill_remaining KILL
--fi
-+run_hooks "" $sysupgrade_pre_upgrade
- 
--if [ -n "$(rootfs_type)" ]; then
--	v "Switching to ramdisk..."
--	run_ramfs '. /lib/functions.sh; include /lib/upgrade; do_upgrade'
--else
--	do_upgrade
--fi
-+install_bin /sbin/upgraded
-+v "Commencing upgrade. All shell sessions will be closed now."
-+ubus call system sysupgrade "{
-+	\"prefix\": \"$RAM_ROOT\",
-+	\"path\": $(json_string "$IMAGE"),
-+	\"command\": \". /lib/functions.sh; include /lib/upgrade; do_upgrade_stage2\"
-+}"

patches/lede/0016-fstools-clean-up-trailing-whitespace-in-snapshot-script.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 08:29:24 +0200
-Subject: fstools: clean up trailing whitespace in snapshot script
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/system/fstools/files/snapshot b/package/system/fstools/files/snapshot
-index c1a5b733f3c70e2bb5f2e83d3589e2f10832760f..baf24f1e3e90fe7708e0f28c17ba270a35a2cd52 100644
---- a/package/system/fstools/files/snapshot
-+++ b/package/system/fstools/files/snapshot
-@@ -42,7 +42,7 @@ do_snapshot_upgrade() {
- 
- 	opkg list-upgradable
- 	[ $? -eq 0 ] || exit 2
--	
-+
- 	UPDATES=`opkg list-upgradable | cut -d" " -f1`
- 	[ -z "${UPDATES}" ] && exit 0
- 

patches/lede/0017-fstools-snapshot-handle-jffs2-conversion-using-upgraded.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 08:29:55 +0200
-Subject: fstools: snapshot: handle jffs2 conversion using upgraded
-
-We can reuse the kill_remaining and run_ramfs facilities of the stage2 run
-by upgraded.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
-index 6f1f511d387e900426832f40966012bc11d53075..f2e0580912ab7d475fab576bea4fd84f0dfe6a3d 100644
---- a/package/system/fstools/Makefile
-+++ b/package/system/fstools/Makefile
-@@ -8,7 +8,7 @@
- include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=fstools
--PKG_RELEASE:=1
-+PKG_RELEASE:=2
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(LEDE_GIT)/project/fstools.git
-diff --git a/package/system/fstools/files/snapshot b/package/system/fstools/files/snapshot
-index baf24f1e3e90fe7708e0f28c17ba270a35a2cd52..a495e3434523b7a4b1b2f1bc3f4c9298197fc745 100644
---- a/package/system/fstools/files/snapshot
-+++ b/package/system/fstools/files/snapshot
-@@ -64,14 +64,16 @@ do_convert_jffs2() {
- do_convert() {
- 	. /lib/functions.sh
- 	. /lib/upgrade/common.sh
--	ubus call system upgrade
--	touch /tmp/sysupgrade
-+
- 	cd /overlay/upper
- 	tar czf /tmp/snapshot.tar.gz *
--	kill_remaining TERM
--	sleep 3
--	kill_remaining KILL
--	run_ramfs '. /sbin/snapshot; do_convert_jffs2'
-+
-+	install_bin /sbin/upgraded
-+	ubus call system sysupgrade "{
-+		\"prefix\": \"$RAM_ROOT\",
-+		\"path\": \"\",
-+		\"command\": \". /sbin/snapshot; do_convert_jffs2\"
-+	}"
- }
- 
- [ -n "$(cat /proc/mounts|grep /overlay|grep jffs2)" ] && {

patches/lede/0018-base-files-sysupgrade-cleanup.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 23 Apr 2017 23:33:14 +0200
-Subject: base-files: sysupgrade cleanup
-
-Some functions only used by stage2 are moved there from common.sh.
-
-One piece that could still use more cleanup is platform_pre_upgrade: many
-targets reference files from there are aren't available in the ramfs, so
-we need to evaluate it before the switch; conversely, flash writes happen
-in that function on some targets. Targets that do the latter should be
-fixed eventually to use platform_do_upgrade for that purpose.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
-index ef9aac709fc1619ba15eeb0aeb4a9a6a372369b2..af7682c29e005c6ca47b91e9be2d60c359a90d05 100644
---- a/package/base-files/files/lib/upgrade/common.sh
-+++ b/package/base-files/files/lib/upgrade/common.sh
-@@ -30,106 +30,6 @@ install_bin() { # <file> [ <symlink> ... ]
- 	}; done
- }
- 
--supivot() { # <new_root> <old_root>
--	/bin/mount | grep "on $1 type" 2>&- 1>&- || /bin/mount -o bind $1 $1
--	mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
--	/bin/mount -o noatime,move /proc $1/proc && \
--	pivot_root $1 $1$2 || {
--		/bin/umount -l $1 $1
--		return 1
--	}
--
--	/bin/mount -o noatime,move $2/sys /sys
--	/bin/mount -o noatime,move $2/dev /dev
--	/bin/mount -o noatime,move $2/tmp /tmp
--	/bin/mount -o noatime,move $2/overlay /overlay 2>&-
--	return 0
--}
--
--run_ramfs() { # <command> [...]
--	install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount	\
--		/sbin/pivot_root /sbin/reboot /bin/sync /bin/dd	/bin/grep       \
--		/bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/dd	\
--		/bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump		\
--		/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
--		/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir	\
--		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
--		/bin/mknod
--
--	install_bin /sbin/mtd
--	install_bin /sbin/mount_root
--	install_bin /sbin/snapshot
--	install_bin /sbin/snapshot_tool
--	install_bin /usr/sbin/ubiupdatevol
--	install_bin /usr/sbin/ubiattach
--	install_bin /usr/sbin/ubiblock
--	install_bin /usr/sbin/ubiformat
--	install_bin /usr/sbin/ubidetach
--	install_bin /usr/sbin/ubirsvol
--	install_bin /usr/sbin/ubirmvol
--	install_bin /usr/sbin/ubimkvol
--	install_bin /usr/sbin/partx
--	install_bin /usr/sbin/losetup
--	install_bin /usr/sbin/mkfs.ext4
--	for file in $RAMFS_COPY_BIN; do
--		install_bin ${file//:/ }
--	done
--	install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
--
--	[ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
--
--	supivot $RAM_ROOT /mnt || {
--		echo "Failed to switch over to ramfs. Please reboot."
--		exit 1
--	}
--
--	/bin/mount -o remount,ro /mnt
--	/bin/umount -l /mnt
--
--	grep /overlay /proc/mounts > /dev/null && {
--		/bin/mount -o noatime,remount,ro /overlay
--		/bin/umount -l /overlay
--	}
--
--	# spawn a new shell from ramdisk to reduce the probability of cache issues
--	exec /bin/busybox ash -c "$*"
--}
--
--kill_remaining() { # [ <signal> [ <loop> ] ]
--	local sig="${1:-TERM}"
--	local loop="${2:-0}"
--	local run=true
--	local stat
--
--	echo -n "Sending $sig to remaining processes ... "
--
--	while $run; do
--		run=false
--		for stat in /proc/[0-9]*/stat; do
--			[ -f "$stat" ] || continue
--
--			local pid name state ppid rest
--			read pid name state ppid rest < $stat
--			name="${name#(}"; name="${name%)}"
--
--			# Skip PID1, ourself and our children
--			[ $pid -ne 1 -a $pid -ne $$ -a $ppid -ne $$ ] || continue
--
--			local cmdline
--			read cmdline < /proc/$pid/cmdline
--
--			# Skip kernel threads
--			[ -n "$cmdline" ] || continue
--
--			echo -n "$name "
--			kill -$sig $pid 2>/dev/null
--
--			[ $loop -eq 1 ] && run=true
--		done
--	done
--	echo ""
--}
--
- run_hooks() {
- 	local arg="$1"; shift
- 	for func in "$@"; do
-diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
-index 4e2aa3a23c3bab07a795762a30a4d4f701081934..cc8047d988e39ca9ba27d2588744aad469d1d978 100755
---- a/package/base-files/files/lib/upgrade/stage2
-+++ b/package/base-files/files/lib/upgrade/stage2
-@@ -24,6 +24,104 @@ export CONF_TAR=/tmp/sysupgrade.tgz
- include /lib/upgrade
- 
- 
-+supivot() { # <new_root> <old_root>
-+	/bin/mount | grep "on $1 type" 2>&- 1>&- || /bin/mount -o bind $1 $1
-+	mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
-+	/bin/mount -o noatime,move /proc $1/proc && \
-+	pivot_root $1 $1$2 || {
-+		/bin/umount -l $1 $1
-+		return 1
-+	}
-+
-+	/bin/mount -o noatime,move $2/sys /sys
-+	/bin/mount -o noatime,move $2/dev /dev
-+	/bin/mount -o noatime,move $2/tmp /tmp
-+	/bin/mount -o noatime,move $2/overlay /overlay 2>&-
-+	return 0
-+}
-+
-+switch_to_ramfs() {
-+	install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount	\
-+		/sbin/pivot_root /sbin/reboot /bin/sync /bin/dd	/bin/grep       \
-+		/bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/dd	\
-+		/bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump		\
-+		/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
-+		/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir	\
-+		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
-+		/bin/mknod
-+
-+	install_bin /sbin/mtd
-+	install_bin /sbin/mount_root
-+	install_bin /sbin/snapshot
-+	install_bin /sbin/snapshot_tool
-+	install_bin /usr/sbin/ubiupdatevol
-+	install_bin /usr/sbin/ubiattach
-+	install_bin /usr/sbin/ubiblock
-+	install_bin /usr/sbin/ubiformat
-+	install_bin /usr/sbin/ubidetach
-+	install_bin /usr/sbin/ubirsvol
-+	install_bin /usr/sbin/ubirmvol
-+	install_bin /usr/sbin/ubimkvol
-+	install_bin /usr/sbin/partx
-+	install_bin /usr/sbin/losetup
-+	install_bin /usr/sbin/mkfs.ext4
-+	for file in $RAMFS_COPY_BIN; do
-+		install_bin ${file//:/ }
-+	done
-+	install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
-+
-+	[ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
-+
-+	supivot $RAM_ROOT /mnt || {
-+		echo "Failed to switch over to ramfs. Please reboot."
-+		exit 1
-+	}
-+
-+	/bin/mount -o remount,ro /mnt
-+	/bin/umount -l /mnt
-+
-+	grep /overlay /proc/mounts > /dev/null && {
-+		/bin/mount -o noatime,remount,ro /overlay
-+		/bin/umount -l /overlay
-+	}
-+}
-+
-+kill_remaining() { # [ <signal> [ <loop> ] ]
-+	local sig="${1:-TERM}"
-+	local loop="${2:-0}"
-+	local run=true
-+	local stat
-+
-+	echo -n "Sending $sig to remaining processes ... "
-+
-+	while $run; do
-+		run=false
-+		for stat in /proc/[0-9]*/stat; do
-+			[ -f "$stat" ] || continue
-+
-+			local pid name state ppid rest
-+			read pid name state ppid rest < $stat
-+			name="${name#(}"; name="${name%)}"
-+
-+			# Skip PID1, ourself and our children
-+			[ $pid -ne 1 -a $pid -ne $$ -a $ppid -ne $$ ] || continue
-+
-+			local cmdline
-+			read cmdline < /proc/$pid/cmdline
-+
-+			# Skip kernel threads
-+			[ -n "$cmdline" ] || continue
-+
-+			echo -n "$name "
-+			kill -$sig $pid 2>/dev/null
-+
-+			[ $loop -eq 1 ] && run=true
-+		done
-+	done
-+	echo ""
-+}
-+
-+
- killall -9 telnetd
- killall -9 dropbear
- killall -9 ash
-@@ -44,7 +142,8 @@ fi
- 
- if [ -n "$(rootfs_type)" ]; then
- 	echo "Switching to ramdisk..."
--	run_ramfs "$COMMAND"
--else
--	exec /bin/busybox ash -c "$COMMAND"
-+	switch_to_ramfs
- fi
-+
-+# Exec new shell from ramfs
-+exec /bin/busybox ash -c "$COMMAND"
-diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
-index fa08f4194daa0ee74758b9f49a23fe8dcb4b933d..347860d00af27a61152703320bb210d30726db83 100755
---- a/package/base-files/files/sbin/sysupgrade
-+++ b/package/base-files/files/sbin/sysupgrade
-@@ -1,7 +1,5 @@
- #!/bin/sh
- 
--[ "$1" = "nand" ] && exec /lib/upgrade/stage2 "$2" "$3"
--
- . /lib/functions.sh
- . /lib/functions/system.sh
- 

patches/lede/0019-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 24 Apr 2017 01:31:04 +0200
-Subject: base-files: add support for staged sysupgrades from failsafe mode
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/preinit/40_run_failsafe_hook b/package/base-files/files/lib/preinit/40_run_failsafe_hook
-index 7301f77349a1a1e42fcef9bcbc927ef55c83b991..533b0a9771e1aac603f00ecf7a4622ea9fee969d 100644
---- a/package/base-files/files/lib/preinit/40_run_failsafe_hook
-+++ b/package/base-files/files/lib/preinit/40_run_failsafe_hook
-@@ -5,8 +5,12 @@
- run_failsafe_hook() {
-     [ "$pi_preinit_no_failsafe" = "y" ] && return
-     if [ "$FAILSAFE" = "true" ]; then
-+	lock /tmp/.failsafe
- 	boot_run_hook failsafe
--	lock -w /tmp/.failsafe
-+	while [ ! -e /tmp/sysupgrade ]; do
-+	    lock -w /tmp/.failsafe
-+	done
-+	exit
-     fi
- }
- 
-diff --git a/package/base-files/files/lib/preinit/99_10_failsafe_login b/package/base-files/files/lib/preinit/99_10_failsafe_login
-index 3147cdc5a68a69cef6b1af6618a4e2367a143c2c..728c63b2e8aebf970cd7dff0d15518ccda83029c 100644
---- a/package/base-files/files/lib/preinit/99_10_failsafe_login
-+++ b/package/base-files/files/lib/preinit/99_10_failsafe_login
-@@ -8,10 +8,13 @@ failsafe_netlogin () {
- }
- 
- failsafe_shell() {
--	lock /tmp/.failsafe
--	ash --login
--	echo "Please reboot system when done with failsafe network logins"
--	while true; do sleep 1; done
-+	local console="$(sed -e 's/ /\n/g' /proc/cmdline | grep '^console=' | head -1 | sed -e 's/^console=//' -e 's/,.*//')"
-+	[ -n "$console" ] || console=console
-+	[ -c "/dev/$console" ] || return 0
-+	while true; do
-+		ash --login <"/dev/$console" >"/dev/$console" 2>"/dev/$console"
-+		sleep 1
-+	done &
- }
- 
- boot_hook_add failsafe failsafe_netlogin
-diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
-index 347860d00af27a61152703320bb210d30726db83..4a133a65e0960619b9cd0d722b6c27ac7894de5b 100755
---- a/package/base-files/files/sbin/sysupgrade
-+++ b/package/base-files/files/sbin/sysupgrade
-@@ -270,8 +270,16 @@ run_hooks "" $sysupgrade_pre_upgrade
- 
- install_bin /sbin/upgraded
- v "Commencing upgrade. All shell sessions will be closed now."
--ubus call system sysupgrade "{
--	\"prefix\": \"$RAM_ROOT\",
--	\"path\": $(json_string "$IMAGE"),
--	\"command\": \". /lib/functions.sh; include /lib/upgrade; do_upgrade_stage2\"
--}"
-+
-+COMMAND='. /lib/functions.sh; include /lib/upgrade; do_upgrade_stage2'
-+
-+if [ -n "$FAILSAFE" ]; then
-+	printf '%s\x00%s\x00%s' "$RAM_ROOT" "$IMAGE" "$COMMAND" >/tmp/sysupgrade
-+	lock -u /tmp/.failsafe
-+else
-+	ubus call system sysupgrade "{
-+		\"prefix\": $(json_string "$RAM_ROOT"),
-+		\"path\": $(json_string "$IMAGE"),
-+		\"command\": $(json_string "$COMMAND")
-+	}"
-+fi

patches/lede/0020-ramips-sysupgrade-move-nand_do_upgrade-call-to-platform_do_upgrade.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 22 Apr 2017 21:27:04 +0200
-Subject: ramips: sysupgrade: move nand_do_upgrade call to platform_do_upgrade
-
-All targets with NAND support should gradually move their nand_do_upgrade
-calls from platform_pre_upgrade to platform_do_upgrade.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
-index 7f5b1dd070b1bfe0b86b093a55165b5a139eb37c..a5cca2080d3b96cef92286b1b15f4f8832d9f8c5 100755
---- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
-@@ -254,20 +254,13 @@ platform_nand_pre_upgrade() {
- 	esac
- }
- 
--platform_pre_upgrade() {
-+platform_do_upgrade() {
- 	local board=$(ramips_board_name)
- 
- 	case "$board" in
-     	ubnt-erx)
- 		nand_do_upgrade "$ARGV"
- 		;;
--	esac
--}
--
--platform_do_upgrade() {
--	local board=$(ramips_board_name)
--
--	case "$board" in
- 	*)
- 		default_do_upgrade "$ARGV"
- 		;;

patches/lede/0021-x86-sysupgrade-move-partition-table-change-check-to-platform_check_image.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 08:57:29 +0200
-Subject: x86: sysupgrade: move partition table change check to platform_check_image
-
-The staged sysupgrade will prevent us from using ask_bool in
-platform_do_upgrade; therefore, the check is moved to platform_check_image.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index d3e9f360aadedad0995da55205364940c9884ba4..81b349a81816033eef9df464b2a70fdb998e5a1d 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -1,13 +1,37 @@
- platform_check_image() {
-+	local diskdev partdev diff
- 	[ "$#" -gt 1 ] && return 1
- 
- 	case "$(get_magic_word "$1")" in
--		eb48|eb63) return 0;;
-+		eb48|eb63) ;;
- 		*)
- 			echo "Invalid image type"
- 			return 1
- 		;;
- 	esac
-+
-+	export_bootdevice && export_partdevice diskdev 0 || {
-+		echo "Unable to determine upgrade device"
-+		return 1
-+	}
-+
-+	get_partitions "/dev/$diskdev" bootdisk
-+
-+	#extract the boot sector from the image
-+	get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null
-+
-+	get_partitions /tmp/image.bs image
-+
-+	#compare tables
-+	diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
-+
-+	rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
-+
-+	if [ -n "$diff" ]; then
-+		echo "Partition layout has changed. Full image will be written."
-+		ask_bool 0 "Abort" && exit 1
-+		return 0
-+	fi
- }
- 
- platform_copy_config() {
-@@ -36,9 +60,6 @@ platform_do_upgrade() {
- 			#compare tables
- 			diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
- 			if [ -n "$diff" ]; then
--				echo "Partition layout is changed.  Full image will be written."
--				ask_bool 0 "Abort" && exit
--
- 				get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
- 				return 0
- 			fi

patches/lede/0022-x86-sysupgrade-refactor-platform_do_upgrade.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 09:05:25 +0200
-Subject: x86: sysupgrade: refactor platform_do_upgrade
-
-By returning early when no upgrade device can be found and handling the
-SAVE_PARTITIONS=0 case differently, we can get rid of two levels of if.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index 81b349a81816033eef9df464b2a70fdb998e5a1d..4fa71999be7be3972676a1019488972dccd57fa2 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -47,40 +47,43 @@ platform_copy_config() {
- platform_do_upgrade() {
- 	local diskdev partdev diff
- 
--	if export_bootdevice && export_partdevice diskdev 0; then
--		sync
--		if [ "$SAVE_PARTITIONS" = "1" ]; then
--			get_partitions "/dev/$diskdev" bootdisk
--
--			#extract the boot sector from the image
--			get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
--
--			get_partitions /tmp/image.bs image
--
--			#compare tables
--			diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
--			if [ -n "$diff" ]; then
--				get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
--				return 0
--			fi
--
--			#iterate over each partition from the image and write it to the boot disk
--			while read part start size; do
--				if export_partdevice partdev $part; then
--					echo "Writing image to /dev/$partdev..."
--					get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
--				else
--					echo "Unable to find partition $part device, skipped."
--				fi
--			done < /tmp/partmap.image
--
--			#copy partition uuid
--			echo "Writing new UUID to /dev/$diskdev..."
--			get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
-+	export_bootdevice && export_partdevice diskdev 0 || {
-+		echo "Unable to determine upgrade device"
-+		return 1
-+	}
-+
-+	sync
-+
-+	if [ "$SAVE_PARTITIONS" = "1" ]; then
-+		get_partitions "/dev/$diskdev" bootdisk
-+
-+		#extract the boot sector from the image
-+		get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
-+
-+		get_partitions /tmp/image.bs image
-+
-+		#compare tables
-+		diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
-+	else
-+		diff=1
-+	fi
-+
-+	if [ -n "$diff" ]; then
-+		get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
-+		return 0
-+	fi
-+
-+	#iterate over each partition from the image and write it to the boot disk
-+	while read part start size; do
-+		if export_partdevice partdev $part; then
-+			echo "Writing image to /dev/$partdev..."
-+			get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
- 		else
--			get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
-+			echo "Unable to find partition $part device, skipped."
- 		fi
-+	done < /tmp/partmap.image
- 
--		sleep 1
--	fi
-+	#copy partition uuid
-+	echo "Writing new UUID to /dev/$diskdev..."
-+	get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
- }

patches/lede/0023-x86-sysupgrade-explicitly-rescan-disk-after-writing-partition-table.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 09:08:29 +0200
-Subject: x86: sysupgrade: explicitly rescan disk after writing partition table
-
-This should ensure that the kernel partition can be mounted in
-platform_copy_config when its size has changed.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index 4fa71999be7be3972676a1019488972dccd57fa2..439ba8f5125d97932248ff966340165a84e1b24a 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -70,6 +70,12 @@ platform_do_upgrade() {
- 
- 	if [ -n "$diff" ]; then
- 		get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
-+
-+		# Separate removal and addtion is necessary; otherwise, partition 1
-+		# will be missing if it overlaps with the old partition 2
-+		partx -d - "/dev/$diskdev"
-+		partx -a - "/dev/$diskdev"
-+
- 		return 0
- 	fi
- 

patches/lede/0024-sunxi-sysupgrade-don-t-write-partitions-twice.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 4 May 2017 07:29:58 +0200
-Subject: sunxi: sysupgrade: don't write partitions twice
-
-When existing partitions are retained, the dd call writing the uboot image
-in the space before the first partition was accidentally writing the whole
-image, making the code for individual partitions redundant. Limit the copy
-to 1016KiB (the first 8KiB are skipped, and the first partition starts at
-1024KiB).
-
-In addition, conv=notrunc is replaced with conv=fsync. It seems this was an
-oversight, as notrunc doesn't make sense for block devices and all other dd
-commands use conv=fsync.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/sunxi/base-files/lib/upgrade/platform.sh b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-index f2cd970d428a780d7497d8802765c656a47ff421..776bdf53bf89c5eafc24b7b59b943e12f3fab77e 100644
---- a/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-@@ -43,7 +43,7 @@ platform_do_upgrade() {
- 			fi
- 
- 			#write uboot image
--			get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 conv=notrunc
-+			get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 count=1016 conv=fsync
- 			#iterate over each partition from the image and write it to the boot disk
- 			while read part start size; do
- 				part="$(($part - 2))"

patches/lede/0025-sunxi-sysupgrade-sync-with-x86.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 4 May 2017 07:39:20 +0200
-Subject: sunxi: sysupgrade: sync with x86
-
-sunxi sysupgrade was based on the x86 implementation; sync fixes and other
-changes from the current x86 version:
-
-x86: fix sysupgrades on disks with 4k block size
-x86: sysupgrade: move partition table change check to platform_check_image
-x86: sysupgrade: refactor platform_do_upgrade
-x86: sysupgrade: explicitly rescan disk after writing partition table
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile
-index 3c2f14b8418e1d296a239027f6fdee9b5ba8f9b2..f8b8aa750a7145c9954df5a5a6a2e85f2610a72f 100644
---- a/target/linux/sunxi/Makefile
-+++ b/target/linux/sunxi/Makefile
-@@ -28,6 +28,6 @@ KERNELNAME:=zImage dtbs
- include $(INCLUDE_DIR)/target.mk
- 
- DEFAULT_PACKAGES += uboot-envtools
--DEFAULT_PACKAGES += mkf2fs e2fsprogs
-+DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs
- 
- $(eval $(call BuildTarget))
-diff --git a/target/linux/sunxi/base-files/lib/upgrade/platform.sh b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-index 776bdf53bf89c5eafc24b7b59b943e12f3fab77e..88ef4790e9c1452f8ce57fe1c265ce47810830ee 100644
---- a/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
-@@ -1,5 +1,28 @@
- platform_check_image() {
--	true
-+	local diskdev partdev diff
-+
-+	export_bootdevice && export_partdevice diskdev -2 || {
-+		echo "Unable to determine upgrade device"
-+		return 1
-+	}
-+
-+	get_partitions "/dev/$diskdev" bootdisk
-+
-+	#extract the boot sector from the image
-+	get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null
-+
-+	get_partitions /tmp/image.bs image
-+
-+	#compare tables
-+	diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
-+
-+	rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
-+
-+	if [ -n "$diff" ]; then
-+		echo "Partition layout has changed. Full image will be written."
-+		ask_bool 0 "Abort" && exit 1
-+		return 0
-+	fi
- }
- 
- platform_copy_config() {
-@@ -13,55 +36,54 @@ platform_copy_config() {
- }
- 
- platform_do_upgrade() {
--	local diskdev partdev ibs diff
--
--	if export_bootdevice && export_partdevice diskdev -2; then
--		sync
--		if [ "$SAVE_PARTITIONS" = "1" ]; then
--			get_partitions "/dev/$diskdev" bootdisk
--
--			#get block size
--			if [ -f "/sys/block/$diskdev/queue/physical_block_size" ]; then
--				ibs="$(cat "/sys/block/$diskdev/queue/physical_block_size")"
--			else
--				ibs=512
--			fi
--
--			#extract the boot sector from the image
--			get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
--
--			get_partitions /tmp/image.bs image
--
--			#compare tables
--			diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
--			if [ -n "$diff" ]; then
--				echo "Partition layout is changed.  Full image will be written."
--				ask_bool 0 "Abort" && exit
--
--				get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
--				return 0
--			fi
--
--			#write uboot image
--			get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 count=1016 conv=fsync
--			#iterate over each partition from the image and write it to the boot disk
--			while read part start size; do
--				part="$(($part - 2))"
--				if export_partdevice partdev $part; then
--					echo "Writing image to /dev/$partdev..."
--					get_image "$@" | dd of="/dev/$partdev" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync
--				else
--					echo "Unable to find partition $part device, skipped."
--				fi
--			done < /tmp/partmap.image
--
--			#copy partition uuid
--			echo "Writing new UUID to /dev/$diskdev..."
--			get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
-+	local diskdev partdev diff
-+
-+	export_bootdevice && export_partdevice diskdev -2 || {
-+		echo "Unable to determine upgrade device"
-+		return 1
-+	}
-+
-+	sync
-+
-+	if [ "$SAVE_PARTITIONS" = "1" ]; then
-+		get_partitions "/dev/$diskdev" bootdisk
-+
-+		#extract the boot sector from the image
-+		get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
-+
-+		get_partitions /tmp/image.bs image
-+
-+		#compare tables
-+		diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
-+	else
-+		diff=1
-+	fi
-+
-+	if [ -n "$diff" ]; then
-+		get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
-+
-+		# Separate removal and addtion is necessary; otherwise, partition 1
-+		# will be missing if it overlaps with the old partition 2
-+		partx -d - "/dev/$diskdev"
-+		partx -a - "/dev/$diskdev"
-+
-+		return 0
-+	fi
-+
-+	#write uboot image
-+	get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 count=1016 conv=fsync
-+	#iterate over each partition from the image and write it to the boot disk
-+	while read part start size; do
-+		part="$(($part - 2))"
-+		if export_partdevice partdev $part; then
-+			echo "Writing image to /dev/$partdev..."
-+			get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
- 		else
--			get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
-+			echo "Unable to find partition $part device, skipped."
- 		fi
-+	done < /tmp/partmap.image
- 
--		sleep 1
--	fi
-+	#copy partition uuid
-+	echo "Writing new UUID to /dev/$diskdev..."
-+	get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
- }

patches/lede/0026-mvebu-fix-sysupgrade.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 1 Jun 2017 18:39:12 +0200
-Subject: mvebu: fix sysupgrade
-
-mvebu was modifying RAMFS_COPY_BIN and RAMFS_COPY_DATA from a
-sysupgrade_pre_upgrade hook. As the ramfs is created from stage2, this
-did not have an effect anymore after the staged sysupgrade changes.
-
-As it doesn't really hurt to copy fw_printenv and fw_setenv
-unconditionally, simply add them in /lib/upgrade/platform.sh, so stage2
-will see them.
-
-Config copying is moved to a function called by platform_copy_config, where
-it belongs.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-Fixes: FS#821
-Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
-
-diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
-index cc8047d988e39ca9ba27d2588744aad469d1d978..bdbb8926643287f48a4ae62c5d1d4b4a29130859 100755
---- a/package/base-files/files/lib/upgrade/stage2
-+++ b/package/base-files/files/lib/upgrade/stage2
-@@ -48,7 +48,7 @@ switch_to_ramfs() {
- 		/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
- 		/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir	\
- 		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
--		/bin/mknod
-+		/bin/mknod /bin/touch
- 
- 	install_bin /sbin/mtd
- 	install_bin /sbin/mount_root
-diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
-index d06a1b8ed0534364b595618f24b65f9f3a3e275d..63d1cd14a4deed407b217a518ae25a752f62969e 100644
---- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
-+++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
-@@ -73,21 +73,7 @@ platform_do_upgrade_linksys() {
- 	}
- }
- 
--linksys_preupgrade() {
--	local board=$(mvebu_board_name)
--
--	case "$board" in
--	armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba|armada-385-linksys-rango)
--		export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
--		export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
--		export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
--
--		[ -f /tmp/sysupgrade.tgz ] && {
--			cp /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
--		}
--		;;
--	esac
-+platform_copy_config_linksys() {
-+	cp -f /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
-+	sync
- }
--
--append sysupgrade_pre_upgrade linksys_preupgrade
--
-diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
-index 77578e28d42fb7ca5e3f057e42ac5818e851736f..55c084483995d548556a560e171462f2d5456172 100755
---- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
-@@ -5,7 +5,8 @@
- 
- . /lib/mvebu.sh
- 
--RAMFS_COPY_DATA=/lib/mvebu.sh
-+RAMFS_COPY_BIN='/usr/sbin/fw_printenv /usr/sbin/fw_setenv'
-+RAMFS_COPY_DATA='/lib/mvebu.sh /etc/fw_env.config /var/lock/fw_printenv.lock'
- REQUIRE_IMAGE_METADATA=1
- 
- platform_check_image() {
-@@ -31,6 +32,9 @@ platform_copy_config() {
- 	local board=$(mvebu_board_name)
- 
- 	case "$board" in
-+	armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
-+		platform_copy_config_linksys
-+		;;
- 	armada-388-clearfog)
- 		platform_copy_config_clearfog "$ARGV"
- 		;;

patches/lede/0027-generic-mtd-backport-unlock-support-and-asserted-fixes-for-certain-Winbond-Spansion-flash-chips.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 20 Jun 2017 11:01:27 +0200
-Subject: generic: mtd: backport unlock support and asserted fixes for certain Winbond/Spansion flash chips
-
-diff --git a/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch b/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..c8aafe2ebbf7368f47e8f4d7a24dd5e45583a136
---- /dev/null
-+++ b/target/linux/generic/patches-4.4/049-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch
-@@ -0,0 +1,66 @@
-+From 32321e950d8a237d7e8f3a9b76220007dfa87544 Mon Sep 17 00:00:00 2001
-+Message-Id: <32321e950d8a237d7e8f3a9b76220007dfa87544.1462572686.git.mschiffer@universe-factory.net>
-+From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= <ezequiel@vanguardiasur.com.ar>
-+Date: Mon, 28 Dec 2015 17:54:51 -0300
-+Subject: [PATCH] mtd: spi-nor: wait until lock/unlock operations are ready
-+
-+On Micron and Numonyx devices, the status register write command
-+(WRSR), raises a work-in-progress bit (WIP) on the status register.
-+The datasheets for these devices specify that while the status
-+register write is in progress, the status register WIP bit can still
-+be read to check the end of the operation.
-+
-+This commit adds a wait_till_ready call on lock/unlock operations,
-+which is required for Micron and Numonyx but should be harmless for
-+others. This is needed to prevent applications from issuing erase or
-+program operations before the unlock operation is completed.
-+
-+Reported-by: Stas Sergeev <stsp@list.ru>
-+Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-+---
-+ drivers/mtd/spi-nor/spi-nor.c | 12 ++++++++++--
-+ 1 file changed, 10 insertions(+), 2 deletions(-)
-+
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -463,6 +463,7 @@ static int stm_lock(struct spi_nor *nor,
-+ 	u8 status_old, status_new;
-+ 	u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
-+ 	u8 shift = ffs(mask) - 1, pow, val;
-++	int ret;
-+ 
-+ 	status_old = read_sr(nor);
-+ 
-+@@ -499,7 +500,10 @@ static int stm_lock(struct spi_nor *nor,
-+ 		return -EINVAL;
-+ 
-+ 	write_enable(nor);
-+-	return write_sr(nor, status_new);
-++	ret = write_sr(nor, status_new);
-++	if (ret)
-++		return ret;
-++	return spi_nor_wait_till_ready(nor);
-+ }
-+ 
-+ /*
-+@@ -513,6 +517,7 @@ static int stm_unlock(struct spi_nor *no
-+ 	uint8_t status_old, status_new;
-+ 	u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
-+ 	u8 shift = ffs(mask) - 1, pow, val;
-++	int ret;
-+ 
-+ 	status_old = read_sr(nor);
-+ 
-+@@ -547,7 +552,10 @@ static int stm_unlock(struct spi_nor *no
-+ 		return -EINVAL;
-+ 
-+ 	write_enable(nor);
-+-	return write_sr(nor, status_new);
-++	ret = write_sr(nor, status_new);
-++	if (ret)
-++		return ret;
-++	return spi_nor_wait_till_ready(nor);
-+ }
-+ 
-+ /*
-diff --git a/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch b/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..0541c95594ec14f62b5db787f4d52d5a42777cdc
---- /dev/null
-+++ b/target/linux/generic/patches-4.4/049-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch
-@@ -0,0 +1,33 @@
-+From edf891ef9ab773363f8e58022a26d7d31604aed6 Mon Sep 17 00:00:00 2001
-+Message-Id: <edf891ef9ab773363f8e58022a26d7d31604aed6.1462572703.git.mschiffer@universe-factory.net>
-+From: Brian Norris <computersforpeace@gmail.com>
-+Date: Fri, 29 Jan 2016 11:25:30 -0800
-+Subject: [PATCH] mtd: spi-nor: wait for SR_WIP to clear on initial unlock
-+
-+Fixup a piece leftover by commit 32321e950d8a ("mtd: spi-nor: wait until
-+lock/unlock operations are ready"). That commit made us wait for the WIP
-+bit to settle after lock/unlock operations, but it missed the open-coded
-+"unlock" that happens at probe() time.
-+
-+We should probably have this code utilize the unlock() routines in the
-+future, to avoid duplication, but unfortunately, flash which need to be
-+unlocked don't all have a proper ->flash_unlock() callback.
-+
-+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-+Cc: Stas Sergeev <stsp@users.sourceforge.net>
-+Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-+Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-+---
-+ drivers/mtd/spi-nor/spi-nor.c | 1 +
-+ 1 file changed, 1 insertion(+)
-+
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -1169,6 +1169,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ 	    info->flags & SPI_NOR_HAS_LOCK) {
-+ 		write_enable(nor);
-+ 		write_sr(nor, 0);
-++		spi_nor_wait_till_ready(nor);
-+ 	}
-+ 
-+ 	if (!mtd->name)
-diff --git a/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..7c6530a5e0e8bc144e1d4497428e3c3691c2ef22
---- /dev/null
-+++ b/target/linux/generic/patches-4.4/466-revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
-@@ -0,0 +1,18 @@
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -1161,6 +1161,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ 	    JEDEC_MFR(info) == SNOR_MFR_INTEL ||
-+ 	    JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
-+ 	    JEDEC_MFR(info) == SNOR_MFR_SST ||
-++	    JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
-+ 	    info->flags & SPI_NOR_HAS_LOCK) {
-+ 		write_enable(nor);
-+ 		write_sr(nor, 0);
-+@@ -1178,6 +1179,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ 
-+ 	/* NOR protection support for STmicro/Micron chips and similar */
-+ 	if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
-++	    JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
-+ 		info->flags & SPI_NOR_HAS_LOCK) {
-+ 		nor->flash_lock = stm_lock;
-+ 		nor->flash_unlock = stm_unlock;

patches/lede/0029-vxlan-add-new-package-for-netifd-VXLAN-proto.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 10 Mar 2017 01:23:50 +0100
-Subject: vxlan: add new package for netifd VXLAN proto
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/network/config/vxlan/Makefile b/package/network/config/vxlan/Makefile
-new file mode 100644
-index 0000000000000000000000000000000000000000..a471d4e90cbe30c1d1dd01dbf7553995d8c0485e
---- /dev/null
-+++ b/package/network/config/vxlan/Makefile
-@@ -0,0 +1,32 @@
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=vxlan
-+PKG_VERSION:=1
-+PKG_LICENSE:=GPL-2.0
-+
-+include $(INCLUDE_DIR)/package.mk
-+
-+define Package/vxlan
-+  SECTION:=net
-+  CATEGORY:=Network
-+  MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
-+  TITLE:=Virtual eXtensible LAN config support
-+  DEPENDS:=+kmod-vxlan
-+endef
-+
-+define Package/vxlan/description
-+ Virtual eXtensible LAN config support in /etc/config/network.
-+endef
-+
-+define Build/Compile
-+endef
-+
-+define Build/Configure
-+endef
-+
-+define Package/vxlan/install
-+	$(INSTALL_DIR) $(1)/lib/netifd/proto
-+	$(INSTALL_BIN) ./files/vxlan.sh $(1)/lib/netifd/proto/vxlan.sh
-+endef
-+
-+$(eval $(call BuildPackage,vxlan))
-diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
-new file mode 100755
-index 0000000000000000000000000000000000000000..27ccd8f12759f69c7c226cac0c923335b8ccc6a8
---- /dev/null
-+++ b/package/network/config/vxlan/files/vxlan.sh
-@@ -0,0 +1,148 @@
-+#!/bin/sh
-+
-+[ -n "$INCLUDE_ONLY" ] || {
-+	. /lib/functions.sh
-+	. /lib/functions/network.sh
-+	. ../netifd-proto.sh
-+	init_proto "$@"
-+}
-+
-+vxlan_generic_setup() {
-+	local cfg="$1"
-+	local mode="$2"
-+	local local="$3"
-+	local remote="$4"
-+
-+	local link="$cfg"
-+
-+	local port vid ttl tos mtu macaddr zone
-+	json_get_vars port vid ttl tos mtu macaddr zone
-+
-+
-+	proto_init_update "$link" 1
-+
-+	proto_add_tunnel
-+	json_add_string mode "$mode"
-+
-+	[ -n "$tunlink" ] && json_add_string link "$tunlink"
-+	[ -n "$local" ] && json_add_string local "$local"
-+	[ -n "$remote" ] && json_add_string remote "$remote"
-+
-+	[ -n "$ttl" ] && json_add_int ttl "$ttl"
-+	[ -n "$tos" ] && json_add_string tos "$tos"
-+	[ -n "$mtu" ] && json_add_int mtu "$mtu"
-+
-+	json_add_object 'data'
-+	[ -n "$port" ] && json_add_int port "$port"
-+	[ -n "$vid" ] && json_add_int id "$vid"
-+	[ -n "$macaddr" ] && json_add_string macaddr "$macaddr"
-+	json_close_object
-+
-+	proto_close_tunnel
-+
-+	proto_add_data
-+	[ -n "$zone" ] && json_add_string zone "$zone"
-+	proto_close_data
-+
-+	proto_send_update "$cfg"
-+}
-+
-+proto_vxlan_setup() {
-+	local cfg="$1"
-+
-+	local ipaddr peeraddr
-+	json_get_vars ipaddr peeraddr tunlink
-+
-+	[ -z "$peeraddr" ] && {
-+		proto_notify_error "$cfg" "MISSING_ADDRESS"
-+		proto_block_restart "$cfg"
-+		exit
-+	}
-+
-+	( proto_add_host_dependency "$cfg" '' "$tunlink" )
-+
-+	[ -z "$ipaddr" ] && {
-+		local wanif="$tunlink"
-+		if [ -z "$wanif" ] && ! network_find_wan wanif; then
-+			proto_notify_error "$cfg" "NO_WAN_LINK"
-+			exit
-+		fi
-+
-+		if ! network_get_ipaddr ipaddr "$wanif"; then
-+			proto_notify_error "$cfg" "NO_WAN_LINK"
-+			exit
-+		fi
-+	}
-+
-+	vxlan_generic_setup "$cfg" 'vxlan' "$ipaddr" "$peeraddr"
-+}
-+
-+proto_vxlan6_setup() {
-+	local cfg="$1"
-+
-+	local ip6addr peer6addr
-+	json_get_vars ip6addr peer6addr tunlink
-+
-+	[ -z "$peer6addr" ] && {
-+		proto_notify_error "$cfg" "MISSING_ADDRESS"
-+		proto_block_restart "$cfg"
-+		exit
-+	}
-+
-+	( proto_add_host_dependency "$cfg" '' "$tunlink" )
-+
-+	[ -z "$ip6addr" ] && {
-+		local wanif="$tunlink"
-+		if [ -z "$wanif" ] && ! network_find_wan6 wanif; then
-+			proto_notify_error "$cfg" "NO_WAN_LINK"
-+			exit
-+		fi
-+
-+		if ! network_get_ipaddr6 ip6addr "$wanif"; then
-+			proto_notify_error "$cfg" "NO_WAN_LINK"
-+			exit
-+		fi
-+	}
-+
-+	vxlan_generic_setup "$cfg" 'vxlan6' "$ip6addr" "$peer6addr"
-+}
-+
-+proto_vxlan_teardown() {
-+	local cfg="$1"
-+}
-+
-+proto_vxlan6_teardown() {
-+	local cfg="$1"
-+}
-+
-+vxlan_generic_init_config() {
-+	no_device=1
-+	available=1
-+
-+	proto_config_add_string "tunlink"
-+	proto_config_add_string "zone"
-+
-+	proto_config_add_int "vid"
-+	proto_config_add_int "port"
-+	proto_config_add_int "ttl"
-+	proto_config_add_int "tos"
-+	proto_config_add_int "mtu"
-+	proto_config_add_string "macaddr"
-+}
-+
-+proto_vxlan_init_config() {
-+	vxlan_generic_init_config
-+	proto_config_add_string "ipaddr"
-+	proto_config_add_string "peeraddr"
-+}
-+
-+proto_vxlan6_init_config() {
-+	vxlan_generic_init_config
-+	proto_config_add_string "ip6addr"
-+	proto_config_add_string "peer6addr"
-+}
-+
-+[ -n "$INCLUDE_ONLY" ] || {
-+	add_protocol vxlan
-+	add_protocol vxlan6
-+}

patches/lede/0030-Revert-scripts-package-metadata.pl-inhibit-compile-deps-on-missing-build-types.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 9 Jan 2018 16:31:07 +0100
-Subject: Revert "scripts/package-metadata.pl: inhibit compile deps on missing build types"
-
-This reverts commit b616aa6db7a9952c182ab49d7942fb67c09803d5. The change
-conflicts with our PROVIDES fix and is not strictly necessary for Gluon.
-
-diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
-index c49d132912828531c7125787f4f53d7130323123..2da32c770ef3333bfcc18922ede556f9734510c7 100755
---- a/scripts/package-metadata.pl
-+++ b/scripts/package-metadata.pl
-@@ -460,27 +460,20 @@ sub gen_package_mk() {
- 			next unless $pkg->{"builddepends/$type"};
- 			foreach my $dep (@{$pkg->{"builddepends/$type"}}) {
- 				my $suffix = "";
--				my $deptype = "";
- 				my $condition;
- 
- 				if ($dep =~ /^(.+):(.+)/) {
- 					$condition = $1;
- 					$dep = $2;
- 				}
--				if ($dep =~ /^(.+)\/(.+)/) {
-+				if ($dep =~ /^(.+)(\/.+)/) {
- 					$dep = $1;
--					$deptype = $2;
--					$suffix = "/$2";
-+					$suffix = $2;
- 				}
- 
- 				my $idx = "";
- 				my $pkg_dep = $package{$dep};
- 				if (defined($pkg_dep) && defined($pkg_dep->{src})) {
--					unless (!$deptype || grep { $_ eq $deptype } @{$pkg_dep->{buildtypes}}) {
--						warn sprintf "WARNING: Makefile '%s' has a %s build dependency on '%s/%s' but '%s' does not implement a '%s' build type\n",
--							$pkg->{makefile}, $type, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
--						next;
--					}
- 					$idx = $pkg_dep->{subdir}.$pkg_dep->{src};
- 				} elsif (defined($srcpackage{$dep})) {
- 					$idx = $subdir{$dep}.$dep;
-@@ -506,16 +499,14 @@ sub gen_package_mk() {
- 			my $condition;
- 			my $prefix = "";
- 			my $suffix = "";
--			my $deptype = "";
- 
- 			if ($deps =~ /^(.+):(.+)/) {
- 				$condition = $1;
- 				$deps = $2;
- 			}
--			if ($deps =~ /^(.+)\/(.+)/) {
-+			if ($deps =~ /^(.+)(\/.+)/) {
- 				$deps = $1;
--				$deptype = $2;
--				$suffix = "/$2";
-+				$suffix = $2;
- 			}
- 
- 			my $pkg_dep = $package{$deps};
-@@ -530,17 +521,7 @@ sub gen_package_mk() {
- 			foreach my $dep (@deps) {
- 				$pkg_dep = $package{$deps};
- 				if (defined $pkg_dep->{src}) {
--					unless (!$deptype || grep { $_ eq $deptype } @{$pkg_dep->{buildtypes}}) {
--						warn sprintf "WARNING: Makefile '%s' has a build dependency on '%s/%s' but '%s' does not implement a '%s' build type\n",
--							$pkg->{makefile}, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
--						next;
--					}
--					unless ($pkg->{src} ne $pkg_dep->{sec}.$suffix) {
--						warn sprintf "WARNING: Makefile '%s' has a build dependency on itself\n",
--							$pkg->{makefile};
--						next;
--					}
--					$idx = $pkg_dep->{subdir}.$pkg_dep->{src};
-+					($pkg->{src} ne $pkg_dep->{src}.$suffix) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
- 				} elsif (defined($srcpackage{$dep})) {
- 					$idx = $subdir{$dep}.$dep;
- 				}
-@@ -592,7 +573,7 @@ ifndef DUMP_TARGET_DB
- 	( \\
- $cmds \\
- 	) > \$@
--
-+	
- ifneq (\$(IMAGEOPT)\$(CONFIG_IMAGEOPT),)
-   package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
- endif

patches/lede/0031-scripts-metadata-always-resolve-dependencies-through-provides-list.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 8 Jul 2017 01:35:35 +0200
-Subject: scripts: metadata: always resolve dependencies through provides list
-
-Instead of adding virtual packages to the normal package list, keep a
-separate list for provides, make each package provide itself, and resolve
-all dependencies through this list. This allows to use PROVIDES to replace
-existing packages.
-
-A side effect of the changes in the makefile dependency logic is that
-build dependencies are now always interpreted as source package names,
-instead of putting build and runtime dependencies into the same list.
-
-Fixes FS#837.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/scripts/feeds b/scripts/feeds
-index 55c294ad0a4ec2f0419d12deddeda7324c349e04..a38eb454585f5dd27b707db23184b7df07ab2658 100755
---- a/scripts/feeds
-+++ b/scripts/feeds
-@@ -252,7 +252,6 @@ sub search_feed {
- 		my $substr;
- 		my $pkgmatch = 1;
- 
--		next if $pkg->{vdepends};
- 		foreach my $substr (@substr) {
- 			my $match;
- 			foreach my $key (qw(name title description src)) {
-@@ -306,7 +305,6 @@ sub list_feed {
- 	get_feed($feed);
- 	foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
- 		my $pkg = $feed_package->{$name};
--		next if $pkg->{vdepends};
- 		if($pkg->{name}) {
- 			printf "\%-32s\t\%s\n", $pkg->{name}, $pkg->{title};
- 		}
-@@ -588,7 +586,6 @@ sub install {
- 				get_feed($f->[1]);
- 				foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
- 					my $p = $feed_package->{$name};
--					next if $p->{vdepends};
- 					if( $p->{name} ) {
- 						install_package($feed, $p->{name}, exists($opts{f})) == 0 or $ret = 1;
- 						get_feed($f->[1]);
-diff --git a/scripts/metadata.pm b/scripts/metadata.pm
-index 8334f26d3179a0eb83aa1aa976778ff5828faf45..e7bdbab4568ddd7e10c10b2ca6a718380c7d6308 100644
---- a/scripts/metadata.pm
-+++ b/scripts/metadata.pm
-@@ -2,9 +2,10 @@ package metadata;
- use base 'Exporter';
- use strict;
- use warnings;
--our @EXPORT = qw(%package %srcpackage %category %subdir %preconfig %features %overrides clear_packages parse_package_metadata parse_target_metadata get_multiline @ignore);
-+our @EXPORT = qw(%package %vpackage %srcpackage %category %subdir %preconfig %features %overrides clear_packages parse_package_metadata parse_target_metadata get_multiline @ignore);
- 
- our %package;
-+our %vpackage;
- our %preconfig;
- our %srcpackage;
- our %category;
-@@ -124,6 +125,7 @@ sub clear_packages() {
- 	%subdir = ();
- 	%preconfig = ();
- 	%package = ();
-+	%vpackage = ();
- 	%srcpackage = ();
- 	%category = ();
- 	%features = ();
-@@ -179,6 +181,9 @@ sub parse_package_metadata($) {
- 			$pkg->{override} = $override;
- 			$package{$1} = $pkg;
- 			push @{$srcpackage{$src}}, $pkg;
-+
-+			$vpackage{$1} or $vpackage{$1} = [];
-+			unshift @{$vpackage{$1}}, $1;
- 		};
- 		/^Feature:\s*(.+?)\s*$/ and do {
- 			undef $pkg;
-@@ -210,14 +215,8 @@ sub parse_package_metadata($) {
- 		/^Provides: \s*(.+)\s*$/ and do {
- 			my @vpkg = split /\s+/, $1;
- 			foreach my $vpkg (@vpkg) {
--				$package{$vpkg} or $package{$vpkg} = {
--					name => $vpkg,
--					vdepends => [],
--					src => $src,
--					subdir => $subdir,
--					makefile => $makefile
--				};
--				push @{$package{$vpkg}->{vdepends}}, $pkg->{name};
-+				$vpackage{$vpkg} or $vpackage{$vpkg} = [];
-+				push @{$vpackage{$vpkg}}, $pkg->{name};
- 			}
- 		};
- 		/^Menu-Depends: \s*(.+)\s*$/ and $pkg->{mdepends} = [ split /\s+/, $1 ];
-diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
-index 2da32c770ef3333bfcc18922ede556f9734510c7..998d37dd415d89e7eccad2ddf73f855f6a9b017c 100755
---- a/scripts/package-metadata.pl
-+++ b/scripts/package-metadata.pl
-@@ -101,14 +101,16 @@ my %dep_check;
- sub __find_package_dep($$) {
- 	my $pkg = shift;
- 	my $name = shift;
--	my $deps = ($pkg->{vdepends} or $pkg->{depends});
-+	my $deps = $pkg->{depends};
- 
- 	return 0 unless defined $deps;
--	foreach my $dep (@{$deps}) {
--		next if $dep_check{$dep};
--		$dep_check{$dep} = 1;
--		return 1 if $dep eq $name;
--		return 1 if ($package{$dep} and (__find_package_dep($package{$dep},$name) == 1));
-+	foreach my $vpkg (@{$deps}) {
-+		foreach my $dep (@{$vpackage{$vpkg}}) {
-+			next if $dep_check{$dep};
-+			$dep_check{$dep} = 1;
-+			return 1 if $dep eq $name;
-+			return 1 if ($package{$dep} and (__find_package_dep($package{$dep},$name) == 1));
-+		}
- 	}
- 	return 0;
- }
-@@ -156,7 +158,6 @@ sub mconf_depends {
- 		my $m = "depends on";
- 		my $flags = "";
- 		$depend =~ s/^([@\+]+)// and $flags = $1;
--		my $vdep;
- 		my $condition = $parent_condition;
- 
- 		next if $condition eq $depend;
-@@ -173,9 +174,9 @@ sub mconf_depends {
- 			}
- 			$depend = $2;
- 		}
--		next if $package{$depend} and $package{$depend}->{buildonly};
- 		if ($flags =~ /\+/) {
--			if ($vdep = $package{$depend}->{vdepends}) {
-+			my $vdep = $vpackage{$depend};
-+			if ($vdep and @$vdep > 0) {
- 				my @vdeps;
- 				$depend = undef;
- 
-@@ -209,7 +210,8 @@ sub mconf_depends {
- 
- 			$flags =~ /@/ or $depend = "PACKAGE_$depend";
- 		} else {
--			if ($vdep = $package{$depend}->{vdepends}) {
-+			my $vdep = $vpackage{$depend};
-+			if ($vdep and @$vdep > 0) {
- 				$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
- 			} else {
- 				$flags =~ /@/ or $depend = "PACKAGE_$depend";
-@@ -413,7 +415,6 @@ sub get_conditional_dep($$) {
- 
- sub gen_package_mk() {
- 	my %conf;
--	my %dep;
- 	my %done;
- 	my $line;
- 
-@@ -423,8 +424,6 @@ sub gen_package_mk() {
- 		my $pkg = $package{$name};
- 		my @srcdeps;
- 
--		next if defined $pkg->{vdepends};
--
- 		$config = "\$(CONFIG_PACKAGE_$name)";
- 		if ($config) {
- 			$pkg->{buildonly} and $config = "";
-@@ -445,16 +444,7 @@ sub gen_package_mk() {
- 			print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$pkg->{buildtypes}})."\n";
- 		}
- 
--		foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
--			foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
--				$dep =~ /@/ or do {
--					$dep =~ s/\+//g;
--					push @srcdeps, $dep;
--				};
--			}
--		}
- 		foreach my $type (@{$pkg->{buildtypes}}) {
--			my @extra_deps;
- 			my %deplines;
- 
- 			next unless $pkg->{"builddepends/$type"};
-@@ -492,63 +482,70 @@ sub gen_package_mk() {
- 			}
- 		}
- 
--		my $hasdeps = 0;
- 		my %deplines;
--		foreach my $deps (@srcdeps) {
--			my $idx;
--			my $condition;
--			my $prefix = "";
--			my $suffix = "";
--
--			if ($deps =~ /^(.+):(.+)/) {
--				$condition = $1;
--				$deps = $2;
--			}
--			if ($deps =~ /^(.+)(\/.+)/) {
--				$deps = $1;
--				$suffix = $2;
--			}
-+		foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
-+			foreach my $bdep (@{$spkg->{builddepends}}) {
-+				my $condition;
-+				my $suffix = "";
- 
--			my $pkg_dep = $package{$deps};
--			my @deps;
-+				if ($bdep =~ /^(.+):(.+)/) {
-+					$condition = $1;
-+					$bdep = $2;
-+				}
-+				if ($bdep =~ /^(.+)(\/.+)/) {
-+					$bdep = $1;
-+					$suffix = $2;
-+				}
- 
--			if ($pkg_dep->{vdepends}) {
--				@deps = @{$pkg_dep->{vdepends}};
--			} else {
--				@deps = ($deps);
-+				next unless $subdir{$bdep};
-+				my $idx = $subdir{$bdep}.$bdep.$suffix;
-+
-+				my $depline = get_conditional_dep($condition, "\$(curdir)/$idx/compile");
-+				if ($depline) {
-+					$deplines{$depline}++;
-+				}
- 			}
- 
--			foreach my $dep (@deps) {
--				$pkg_dep = $package{$deps};
--				if (defined $pkg_dep->{src}) {
--					($pkg->{src} ne $pkg_dep->{src}.$suffix) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
--				} elsif (defined($srcpackage{$dep})) {
--					$idx = $subdir{$dep}.$dep;
-+			foreach my $dep (@{$spkg->{depends}}) {
-+				my $condition;
-+				my $suffix = "";
-+
-+				next if $dep =~ /@/;
-+				$dep =~ s/\+//g;
-+
-+				if ($dep =~ /^(.+):(.+)/) {
-+					$condition = $1;
-+					$dep = $2;
- 				}
--				undef $idx if $idx eq 'base-files';
--				if ($idx) {
--					$idx .= $suffix;
-+				if ($dep =~ /^(.+)(\/.+)/) {
-+					$dep = $1;
-+					$suffix = $2;
-+				}
-+
-+				next unless $vpackage{$dep};
-+
-+				my @vdeps = @{$vpackage{$dep}};
-+				foreach my $vdep (@vdeps) {
-+					my $pkg_dep = $package{$vdep};
- 
--					my $depline;
-+					next unless $pkg_dep;
- 					next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
--					next if $dep{$condition.":".$pkg->{src}."->".$idx};
--					next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
--					my $depstr;
- 
--					if ($pkg_dep->{vdepends}) {
--						$depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
--						$dep{$pkg->{src}."->($dep)".$idx} = 1;
-+					my $idx = $pkg_dep->{subdir}.$pkg_dep->{src}.$suffix;
-+					my $depstr;
-+					if (@vdeps > 1) {
-+						$depstr = "\$(if \$(CONFIG_PACKAGE_$vdep),\$(curdir)/$idx/compile)";
- 					} else {
- 						$depstr = "\$(curdir)/$idx/compile";
--						$dep{$pkg->{src}."->".$idx} = 1;
- 					}
--					$depline = get_conditional_dep($condition, $depstr);
-+					my $depline = get_conditional_dep($condition, $depstr);
- 					if ($depline) {
- 						$deplines{$depline}++;
- 					}
- 				}
- 			}
- 		}
-+
- 		my $depline = join(" ", sort keys %deplines);
- 		if ($depline) {
- 			$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
-@@ -573,7 +570,7 @@ ifndef DUMP_TARGET_DB
- 	( \\
- $cmds \\
- 	) > \$@
--	
-+
- ifneq (\$(IMAGEOPT)\$(CONFIG_IMAGEOPT),)
-   package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
- endif

patches/lede/0032-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 10 Jul 2017 10:35:19 +0200
-Subject: base-files: upgrade: correctly handle nand_do_upgrade argument passed from preupgrade
-
-Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
-index af7682c29e005c6ca47b91e9be2d60c359a90d05..6ccd84c5a95348124412adc8bf41d3fa4894435a 100644
---- a/package/base-files/files/lib/upgrade/common.sh
-+++ b/package/base-files/files/lib/upgrade/common.sh
-@@ -222,7 +222,7 @@ default_do_upgrade() {
- do_upgrade_stage2() {
- 	v "Performing system upgrade..."
- 	if [ -n "$do_upgrade" ]; then
--		$do_upgrade "$IMAGE"
-+		eval "$do_upgrade"
- 	elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
- 		platform_do_upgrade "$IMAGE"
- 	else
-diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
-index 1e69c8f9657b39adf2a2c33bd9bac9303bcbc3d7..72f0fe0e10312e74ce085ad53f0adceb921fd013 100644
---- a/package/base-files/files/lib/upgrade/nand.sh
-+++ b/package/base-files/files/lib/upgrade/nand.sh
-@@ -289,7 +289,7 @@ nand_do_upgrade() {
- 		# hook; this piece of code handles scripts that haven't been
- 		# updated. All scripts should gradually move to call nand_do_upgrade
- 		# from platform_do_upgrade instead.
--		export do_upgrade=nand_do_upgrade
-+		export do_upgrade="nand_do_upgrade '$1'"
- 		return
- 	fi
- 

patches/lede/0033-base-files-upgrade-don-t-loop-forever-trying-to-kill-processes.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 13 Jul 2017 00:19:32 +0200
-Subject: base-files: upgrade: don't loop forever trying to kill processes
-
-When processes don't die on SIGKILL (usually because of kernel bugs), it's
-better to give up instead of looping forever.
-
-upgraded will trigger a reboot in this case (and if this fails, a hardware
-watchdog will eventually time out and reset the system, if present).
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
-index bdbb8926643287f48a4ae62c5d1d4b4a29130859..097ad63adfecdd70019acaa5b652d2056e774c3f 100755
---- a/package/base-files/files/lib/upgrade/stage2
-+++ b/package/base-files/files/lib/upgrade/stage2
-@@ -87,6 +87,8 @@ switch_to_ramfs() {
- }
- 
- kill_remaining() { # [ <signal> [ <loop> ] ]
-+	local loop_limit=10
-+
- 	local sig="${1:-TERM}"
- 	local loop="${2:-0}"
- 	local run=true
-@@ -117,8 +119,15 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
- 
- 			[ $loop -eq 1 ] && run=true
- 		done
-+
-+		let loop_limit--
-+		[ $loop_limit -eq 0 ] && {
-+			echo
-+			echo "Failed to kill all processes."
-+			exit 1
-+		}
- 	done
--	echo ""
-+	echo
- }
- 
- 

patches/lede/0034-bcm53xx-upgrade-fix-RAMFS_COPY_.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 10 Jun 2017 16:14:54 +0200
-Subject: bcm53xx: upgrade: fix RAMFS_COPY_*
-
-Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
-index 097ad63adfecdd70019acaa5b652d2056e774c3f..8cc8c8b34e9f349f1d1283ac00f9782b52ab01c1 100755
---- a/package/base-files/files/lib/upgrade/stage2
-+++ b/package/base-files/files/lib/upgrade/stage2
-@@ -48,7 +48,7 @@ switch_to_ramfs() {
- 		/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
- 		/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir	\
- 		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
--		/bin/mknod /bin/touch
-+		/bin/mknod /bin/touch /bin/sed
- 
- 	install_bin /sbin/mtd
- 	install_bin /sbin/mount_root
-diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
-index f2e007db22fa8fde93bf0dd58b359f6515e0445c..6a9e4950450cb896db7ebb3eb901b5cf51030295 100644
---- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
-@@ -1,3 +1,5 @@
-+RAMFS_COPY_BIN='/usr/bin/osafeloader /usr/bin/oseama'
-+
- PART_NAME=firmware
- 
- # $(1): file to read magic from
-@@ -260,8 +262,6 @@ platform_pre_upgrade_seama() {
- }
- 
- platform_pre_upgrade() {
--	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/bin/osafeloader /usr/bin/oseama /bin/sed"
--
- 	local file_type=$(platform_identify "$1")
- 
- 	[ "$(platform_flash_type)" != "nand" ] && return