LEDE v17.01.3: adjust config defaults

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
uhttp: update to latest version
2017-10-03 15:10:53 +03:00 · 2017-10-03 13:03:27 +02:00 · 2017-10-02 18:51:17 +02:00 · 2017-10-02 18:46:24 +02:00 · 2017-10-02 18:36:21 +02:00 · 2017-10-01 10:52:14 +02:00
6499 changed files with 577480 additions and 507045 deletions
--- a/.github/issue_template
+++ b/.github/issue_template
@@ -0,0 +1,13 @@
+This repository is a mirror of our main repo at https://git.lede-project.org/sources.git
+It is for reference only and is not active for checkins or for reporting issues.
+
+All issues should be reported at: https://bugs.lede-project.org
+
+Please do not open any NEW issue here - we will be closing the Github issues
+capability in the near future.
+
+We will continue to accept Pull Requests here as described in the repo description.
+
+Close this now and click here: https://bugs.lede-project.org
+
+Thankyou for your co-operation.
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 /feeds
 /feeds.conf
 /files
+/overlay
 /package/feeds
 /package/openwrt-packages
 key-build*
--- a/Config.in
+++ b/Config.in
@@ -4,7 +4,7 @@
 # See /LICENSE for more information.
 #

-mainmenu "OpenWrt Configuration"
+mainmenu "LEDE Configuration"

 config MODULES
 	option modules
--- a/14
+++ b/14
@@ -14,7 +14,7 @@ export TOPDIR LC_ALL LANG TZ

 empty:=
 space:= $(empty) $(empty)
-$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt directory must not include any spaces))
+$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the LEDE directory must not include any spaces))

 world:

@@ -44,6 +44,7 @@ $(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUI
 $(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
 $(package/stamp-install): $(package/stamp-compile)
 $(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
+check: $(tools/stamp-check) $(toolchain/stamp-check) $(package/stamp-check)

 printdb:
 	@true
@@ -51,7 +52,7 @@ printdb:
 prepare: $(target/stamp-compile)

 clean: FORCE
-	rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(BUILD_LOG_DIR)
+	rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR) $(TOPDIR)/staging_dir/packages

 dirclean: clean
 	rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)
@@ -83,9 +84,18 @@ prereq: $(target/stamp-prereq) tmp/.prereq_packages
 		exit 1; \
 	fi

+checksum: FORCE
+	$(call sha256sums,$(BIN_DIR))
+
+diffconfig: FORCE
+	mkdir -p $(BIN_DIR)
+	$(SCRIPT_DIR)/diffconfig.sh > $(BIN_DIR)/config.seed
+
 prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
 world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE
 	$(_SINGLE)$(SUBMAKE) -r package/index
+	$(_SINGLE)$(SUBMAKE) -r diffconfig
+	$(_SINGLE)$(SUBMAKE) -r checksum

 .PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean

--- a/14
+++ b/14
@@ -1,6 +1,6 @@
-This is the buildsystem for the OpenWrt Linux distribution.
+This is the buildsystem for the LEDE Linux distribution.

-Please use "make menuconfig" to configure your appreciated
+Please use "make menuconfig" to choose your preferred
 configuration for the toolchain and firmware.

 You need to have installed gcc, binutils, bzip2, flex, python, perl, make,
@@ -17,19 +17,13 @@ Simply running "make" will build your firmware.
 It will download all sources, build the cross-compile toolchain, 
 the kernel and all choosen applications.

-You can use "scripts/flashing/flash.sh" for remotely updating your embedded
-system via tftp.
-
-The OpenWrt system is documented in docs/. You will need a LaTeX distribution
-and the tex4ht package to build the documentation. Type "make -C docs/" to build it.
-
 To build your own firmware you need to have access to a Linux, BSD or MacOSX system
 (case-sensitive filesystem required). Cygwin will not be supported because of
 the lack of case sensitiveness in the file system.


 Sunshine!
-	Your OpenWrt Project
-	http://openwrt.org
+	Your LEDE Community
+	http://www.lede-project.org


--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -1,4 +1,5 @@
 # Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2016 LEDE Project
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -6,6 +7,10 @@

 menu "Global build settings"

+	config ALL_NONSHARED
+		bool "Select all target specific packages by default"
+		default ALL || BUILDBOT
+
 	config ALL_KMODS
 		bool "Select all kernel module packages by default"
 		default ALL
@@ -14,6 +19,16 @@ menu "Global build settings"
 		bool "Select all userspace packages by default"
 		default n

+	config BUILDBOT
+		bool "Set build defaults for automatic builds (e.g. via buildbot)"
+		default n
+		help
+		  This option changes several defaults to be more suitable for
+		  automatic builds. This includes the following changes:
+		  - Deleting build directories after compiling (to save space)
+		  - Enabling per-device rootfs support
+		  ...
+
 	config SIGNED_PACKAGES
 		bool "Cryptographically signed package lists"
 		default y
@@ -42,10 +57,7 @@ menu "Global build settings"

 	config SHADOW_PASSWORDS
 		bool
-		prompt "Enable shadow password support"
 		default y
-		help
-		  Enable shadow password support.

 	config CLEAN_IPKG
 		bool
@@ -59,7 +71,7 @@ menu "Global build settings"
 		bool
 		prompt "Collect kernel debug information"
 		select KERNEL_DEBUG_INFO
-		default n
+		default BUILDBOT
 		help
 		  This collects debugging symbols from the kernel and all compiled modules.
 		  Useful for release builds, so that kernel issues can be debugged offline
@@ -85,59 +97,6 @@ menu "Global build settings"
 		help
 		  Enables IPv6 support in kernel (builtin) and packages.

-	config PKG_BUILD_PARALLEL
-		bool
-		prompt "Compile certain packages parallelized"
-		default y
-		help
-		  This adds a -jX option to certain packages that are known to behave well
-		  for parallel build. By default, the package make processes use the main
-		  jobserver, in which case this option only takes effect when you add -jX
-		  to the make command.
-
-		  If you are unsure, select N.
-
-	config PKG_BUILD_USE_JOBSERVER
-		bool
-		prompt "Use top-level make jobserver for packages"
-		depends on PKG_BUILD_PARALLEL
-		default y
-		help
-		  This passes the main make process jobserver fds to package builds,
-		  enabling full parallelization across different packages.
-
-		  Note that disabling this may overcommit CPU resources depending on the
-		  -j level of the main make process, the number of package submake jobs
-		  selected below and the number of actual CPUs present.
-		  Example: If the main make is passed a -j4 and the submake -j
-		  is also set to 4, we may end up with 16 parallel make processes
-		  in the worst case.
-
-	config PKG_BUILD_JOBS
-		int
-		prompt "Number of package submake jobs (2-512)"
-		range 2 512
-		default 2
-		depends on PKG_BUILD_PARALLEL && !PKG_BUILD_USE_JOBSERVER
-		help
-		  The number of jobs (-jX) to pass to packages submake.
-
-	config PKG_DEFAULT_PARALLEL
-		bool
-		prompt "Parallelize the default package build rule (May break build)"
-		depends on PKG_BUILD_PARALLEL
-		depends on BROKEN
-		default n
-		help
-		  Always set the default package build rules to parallel build.
-
-		  WARNING: This may break build or kill your cat, as it builds packages
-		  with multiple jobs that are probably not tested in a parallel build
-		  environment.
-
-		  Only say Y if you don't mind fixing broken packages.  Before reporting
-		  build bugs, set this to N and re-run the build.
-
 	comment "Stripping options"

 	choice
@@ -231,7 +190,7 @@ menu "Global build settings"
 		config PKG_CC_STACKPROTECTOR_STRONG
 			bool "Strong"
 			select SSP_SUPPORT if !USE_MUSL
-			depends on GCC_VERSION_5
+			depends on !GCC_VERSION_4_8
 			depends on KERNEL_CC_STACKPROTECTOR_STRONG
 	endchoice

@@ -246,7 +205,7 @@ menu "Global build settings"
 		config KERNEL_CC_STACKPROTECTOR_REGULAR
 			bool "Regular"
 		config KERNEL_CC_STACKPROTECTOR_STRONG
-			depends on GCC_VERSION_5
+			depends on !GCC_VERSION_4_8
 			bool "Strong"
 	endchoice

--- a/config/Config-devel.in
+++ b/config/Config-devel.in
@@ -59,7 +59,7 @@ menuconfig DEVEL
 		bool "Use ccache" if DEVEL
 		default n
 		help
-		  Compiler cache; see http://ccache.samba.org/.
+		  Compiler cache; see https://ccache.samba.org/

 	config EXTERNAL_KERNEL_TREE
 		string "Use external kernel tree" if DEVEL
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -16,6 +16,7 @@ menu "Target Images"
 			prompt "Compression"
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
+			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx
 			default TARGET_INITRAMFS_COMPRESSION_NONE
 			depends on TARGET_ROOTFS_INITRAMFS
 			help
@@ -72,13 +73,6 @@ menu "Target Images"
 		help
 		  Build an ext4 root filesystem.

-		config TARGET_EXT4_MAXINODE
-			int "Maximum number of inodes in root filesystem"
-			depends on TARGET_ROOTFS_EXT4FS
-			default 6000
-			help
-			  Select the maximum number of inodes in the root filesystem.
-
 		config TARGET_EXT4_RESERVED_PCT
 			int "Percentage of reserved blocks in root filesystem"
 			depends on TARGET_ROOTFS_EXT4FS
@@ -126,7 +120,7 @@ menu "Target Images"

 	config TARGET_ROOTFS_JFFS2
 		bool "jffs2"
-		default y if USES_JFFS2
+		depends on USES_JFFS2
 		help
 		  Build a JFFS2 root filesystem.

@@ -186,7 +180,7 @@ menu "Target Images"

 	config GRUB_IMAGES
 		bool "Build GRUB images (Linux x86 or x86_64 host only)"
-		depends on TARGET_x86_64 || (TARGET_x86 && !TARGET_x86_rdc)
+		depends on TARGET_x86
 		depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
 		select PACKAGE_grub2
 		default y
@@ -207,7 +201,6 @@ menu "Target Images"
 		int "Serial port baud rate"
 		depends on GRUB_IMAGES
 		default 38400 if TARGET_x86_generic
-		default 38400 if TARGET_x86_geode
 		default 115200

 	config GRUB_BOOTOPTS
@@ -254,12 +247,12 @@ menu "Target Images"
 	config TARGET_KERNEL_PARTSIZE
 		int "Kernel partition size (in MB)"
 		depends on GRUB_IMAGES
-		default 4
+		default 16

 	config TARGET_ROOTFS_PARTSIZE
 		int "Root filesystem partition size (in MB)"
-		depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532
-		default 48
+		depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 || TARGET_mvebu || TARGET_uml
+		default 256
 		help
 		  Select the root filesystem partition size.

@@ -271,45 +264,4 @@ menu "Target Images"
 		  it will be mounted by PARTUUID which makes the kernel find the
 		  appropriate disk automatically.

-
-	menuconfig TARGET_ROOTFS_INCLUDE_KERNEL
-		bool "Include kernel in root filesystem"
-		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
-		default n
-		help
-		  Include the kernel image in the rootfs. Typically, the image is placed
-		  below /boot.
-
-		config TARGET_ROOTFS_INCLUDE_UIMAGE
-			bool "include uImage" if TARGET_ROOTFS_INCLUDE_KERNEL
-			default y
-			help
-			  This option might not apply to all targets. Make sure
-			  to check target/linux/<your_target>/image/Makefile to
-			  see if this option will have any effect.
-
-		config TARGET_ROOTFS_INCLUDE_ZIMAGE
-			bool "include zImage" if TARGET_ROOTFS_INCLUDE_KERNEL
-			default y
-			help
-			  This option might not apply to all targets. Make sure
-			  to check target/linux/<your_target>/image/Makefile to
-			  see if this option will have any effect.
-
-		config TARGET_ROOTFS_INCLUDE_FIT
-			bool "include FIT" if TARGET_ROOTFS_INCLUDE_KERNEL
-			default y
-			help
-			  This option might not apply to all targets. Make sure
-			  to check target/linux/<your_target>/image/Makefile to
-			  see if this option will have any effect.
-
-	config TARGET_ROOTFS_INCLUDE_DTB
-		bool "Include DTB in root filesystem"
-		depends on USES_DEVICETREE && (TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS)
-		default n
-		help
-		  Include the device tree blob file(s) in the rootfs. Typically the DTBs
-		  are placed below /boot.
-
 endmenu
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -26,7 +26,7 @@ config KERNEL_PRINTK

 config KERNEL_CRASHLOG
 	bool "Crash logging"
-	depends on !(arm || powerpc || sparc || TARGET_uml)
+	depends on !(arm || powerpc || sparc || TARGET_uml || i386 || x86_64)
 	default y

 config KERNEL_SWAP
@@ -42,9 +42,15 @@ config KERNEL_DEBUG_FS
 	  write to these files. Many common debugging facilities, such as
 	  ftrace, require the existence of debugfs.

+config KERNEL_ARM_PMU
+	bool
+	default n
+	depends on (arm || arm64)
+
 config KERNEL_PERF_EVENTS
 	bool
 	default n
+	select KERNEL_ARM_PMU if (arm || arm64)

 config KERNEL_PROFILING
 	bool "Compile the kernel with profiling enabled"
@@ -56,7 +62,7 @@ config KERNEL_PROFILING

 config KERNEL_KALLSYMS
 	bool "Compile the kernel with symbol table information"
-	default y
+	default y if !SMALL_FLASH
 	help
 	  This will give you more information in stack traces from kernel oopses.

@@ -184,6 +190,14 @@ config KERNEL_MAGIC_SYSRQ
 	bool "Compile the kernel with SysRq support"
 	default y

+config KERNEL_DEBUG_PINCTRL
+	bool "Compile the kernel with pinctrl debugging"
+	select KERNEL_DEBUG_KERNEL
+
+config KERNEL_DEBUG_GPIO
+	bool "Compile the kernel with gpio debugging"
+	select KERNEL_DEBUG_KERNEL
+
 config KERNEL_COREDUMP
 	bool

@@ -245,6 +259,25 @@ if KERNEL_DEVTMPFS

 endif

+config KERNEL_KEYS
+    bool "Enable kernel access key retention support"
+    default n
+
+config KERNEL_PERSISTENT_KEYRINGS
+    bool "Enable kernel persistent keyrings"
+    depends on KERNEL_KEYS
+    default n
+
+config KERNEL_BIG_KEYS
+    bool "Enable large payload keys on kernel keyrings"
+    depends on KERNEL_KEYS
+    default n
+
+config KERNEL_ENCRYPTED_KEYS
+    tristate "Enable keys with encrypted payloads on kernel keyrings"
+    depends on KERNEL_KEYS
+    default n
+
 #
 # CGROUP support symbols
 #
@@ -624,3 +657,105 @@ if KERNEL_IP_PNP
 		def_bool y

 endif
+
+menu "Filesystem ACL and attr support options"
+	config USE_FS_ACL_ATTR
+		bool "Use filesystem ACL and attr support by default"
+		default n
+		help
+		  Make using ACLs (e.g. POSIX ACL, NFSv4 ACL) the default
+		  for kernel and packages, except tmpfs, flash filesystems,
+		  and old NFS.  Also enable userspace extended attribute support
+		  by default.  (OpenWrt already has an expection it will be
+		  present in the kernel).
+
+	config KERNEL_FS_POSIX_ACL
+		bool "Enable POSIX ACL support"
+		default y if USE_FS_ACL_ATTR
+
+	config KERNEL_BTRFS_FS_POSIX_ACL
+		bool "Enable POSIX ACL for BtrFS Filesystems"
+		select KERNEL_FS_POSIX_ACL
+		default y if USE_FS_ACL_ATTR
+
+	config KERNEL_EXT4_FS_POSIX_ACL
+		bool "Enable POSIX ACL for Ext4 Filesystems"
+		select KERNEL_FS_POSIX_ACL
+		default y if USE_FS_ACL_ATTR
+
+	config KERNEL_F2FS_FS_POSIX_ACL
+		bool "Enable POSIX ACL for F2FS Filesystems"
+		select KERNEL_FS_POSIX_ACL
+		default n
+
+	config KERNEL_JFFS2_FS_POSIX_ACL
+		bool "Enable POSIX ACL for JFFS2 Filesystems"
+		select KERNEL_FS_POSIX_ACL
+		default n
+
+	config KERNEL_TMPFS_POSIX_ACL
+		bool "Enable POSIX ACL for TMPFS Filesystems"
+		select KERNEL_FS_POSIX_ACL
+		default n
+
+	config KERNEL_CIFS_ACL
+		bool "Enable CIFS ACLs"
+		select KERNEL_FS_POSIX_ACL
+		default y if USE_FS_ACL_ATTR
+
+	config KERNEL_HFS_FS_POSIX_ACL
+		bool "Enable POSIX ACL for HFS Filesystems"
+		select KERNEL_FS_POSIX_ACL
+		default y if USE_FS_ACL_ATTR
+
+	config KERNEL_HFSPLUG_FS_POSIX_ACL
+		bool "Enable POSIX ACL for HFS+ Filesystems"
+		select KERNEL_FS_POSIX_ACL
+		default y if USE_FS_ACL_ATTR
+
+	config KERNEL_NFS_ACL_SUPPORT
+		bool "Enable ACLs for NFS"
+		default y if USE_FS_ACL_ATTR
+
+	config KERNEL_NFS_V3_ACL_SUPPORT
+		bool "Enable ACLs for NFSv3"
+		default n
+
+	config KERNEL_NFSD_V2_ACL_SUPPORT
+		bool "Enable ACLs for NFSDv2"
+		default n
+
+	config KERNEL_NFSD_V3_ACL_SUPPORT
+		bool "Enable ACLs for NFSDv3"
+		default n
+
+	config KERNEL_REISER_FS_POSIX_ACL
+		bool "Enable POSIX ACLs for ReiserFS"
+		select KERNEL_FS_POSIX_ACL
+		default y if USE_FS_ACL_ATTR
+
+	config KERNEL_XFS_POSIX_ACL
+		bool "Enable POSIX ACLs for XFS"
+		select KERNEL_FS_POSIX_ACL
+		default y if USE_FS_ACL_ATTR
+
+	config KERNEL_JFS_POSIX_ACL
+		bool "Enable POSIX ACLs for JFS"
+		select KERNEL_FS_POSIX_ACL
+		default y if USE_FS_ACL_ATTR
+
+endmenu
+
+config KERNEL_DEVMEM
+	bool "/dev/mem virtual device support"
+	help
+	  Say Y here if you want to support the /dev/mem device.
+	  The /dev/mem device is used to access areas of physical
+	  memory.
+
+config KERNEL_DEVKMEM
+	bool "/dev/kmem virtual device support"
+	help
+	  Say Y here if you want to support the /dev/kmem device. The
+	  /dev/kmem device is rarely used, but can be used for certain
+	  kind of kernel debugging operations.
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,15 +0,0 @@
-*.log
-*.aux
-*.toc
-*.out
-*.lg
-*.dvi
-*.idv
-*.4ct
-*.4tc
-*.xref
-*.tmp
-*.dvi
-*.html
-*.css
-*.pdf
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,48 +0,0 @@
-ifeq ($(TOPDIR),)
-  TOPDIR:=${CURDIR}/..
-endif
-PKG_NAME=docs
-
-all: compile
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/prereq.mk
-
-MAIN = openwrt.tex
-DEPS = $(MAIN) Makefile config.tex network.tex network-scripts.tex network-scripts.tex wireless.tex build.tex adding.tex bugs.tex debugging.tex $(TMP_DIR)/.prereq-docs
-
-compile: $(TMP_DIR)/.prereq-docs
-	$(NO_TRACE_MAKE) cleanup
-	latex $(MAIN)
-	$(NO_TRACE_MAKE) openwrt.pdf openwrt.html
-	$(NO_TRACE_MAKE) cleanup
-
-$(TMP_DIR)/.prereq-docs:
-	mkdir -p $(TMP_DIR)
-	$(NO_TRACE_MAKE) prereq
-	touch $@
-
-openwrt.html: $(DEPS)
-	htlatex $(MAIN)
-
-openwrt.pdf: $(DEPS)
-	pdflatex $(MAIN)
-
-clean: cleanup
-	rm -f openwrt.pdf openwrt.html openwrt.css
-
-cleanup: FORCE
-	rm -f *.log *.aux *.toc *.out *.lg *.dvi *.idv *.4ct *.4tc *.xref *.tmp *.dvi
-
-$(eval $(call RequireCommand,latex, \
-	You need to install LaTeX to build the OpenWrt documentation \
-))
-$(eval $(call RequireCommand,pdflatex, \
-	You need to install PDFLaTeX to build the OpenWrt documentation \
-))
-$(eval $(call RequireCommand,htlatex, \
-	You need to install tex4ht to build the OpenWrt documentation \
-))
-
-FORCE:
-.PHONY: FORCE
--- a/docs/adding.tex
+++ b/docs/adding.tex
@@ -1,590 +0,0 @@
-Linux is now one of the most widespread operating system for embedded devices due
-to its openess as well as the wide variety of platforms it can run on. Many
-manufacturer actually use it in firmware you can find on many devices: DVB-T 
-decoders, routers, print servers, DVD players ... Most of the time the stock 
-firmware is not really open to the consumer, even if it uses open source software.
-
-You might be interested in running a Linux based firmware for your router for
-various reasons: extending the use of a network protocol (such as IPv6), having
-new features, new piece of software inside, or for security reasons. A fully 
-open-source firmware is de-facto needed for such applications, since you want to
-be free to use this or that version of a particular reason, be able to correct a
-particular bug. Few manufacturers do ship their routers with a Sample Development Kit,
-that would allow you to create your own and custom firmware and most of the time,
-when they do, you will most likely not be able to complete the firmware creation process.
-
-This is one of the reasons why OpenWrt and other firmware exists: providing a 
-version independent, and tools independent firmware, that can be run on various 
-platforms, known to be running Linux originally.
-
-\subsection{Which Operating System does this device run?}
-
-There is a lot of methods to ensure your device is running Linux. Some of them do
-need your router to be unscrewed and open, some can be done by probing the device
-using its external network interfaces.
-
-\subsubsection{Operating System fingerprinting and port scanning}
-
-A large bunch of tools over the Internet exists in order to let you do OS 
-fingerprinting, we will show here an example using \textbf{nmap}:
-
-\begin{Verbatim}
-nmap -P0 -O <IP address>
-Starting Nmap 4.20 ( http://insecure.org ) at 2007-01-08 11:05 CET
-Interesting ports on 192.168.2.1:
-Not shown: 1693 closed ports
-PORT   STATE SERVICE
-22/tcp open  ssh
-23/tcp open  telnet
-53/tcp open  domain
-80/tcp open  http
-MAC Address: 00:13:xx:xx:xx:xx (Cisco-Linksys)
-Device type: broadband router
-Running: Linksys embedded
-OS details: Linksys WRT54GS v4 running OpenWrt w/Linux kernel 2.4.30
-Network Distance: 1 hop
-\end{Verbatim}
-
-nmap is able to report whether your device uses a Linux TCP/IP stack, and if so,
-will show you which Linux kernel version is probably runs. This report is quite 
-reliable and it can make the distinction between BSD and Linux TCP/IP stacks and others.
-
-Using the same tool, you can also do port scanning and service version discovery.
-For instance, the following command will report which IP-based services are running
-on the device, and which version of the service is being used:
-
-\begin{verbatim}
-nmap -P0 -sV <IP address>
-Starting Nmap 4.20 ( http://insecure.org ) at 2007-01-08 11:06 CET
-Interesting ports on 192.168.2.1:
-Not shown: 1693 closed ports
-PORT   STATE SERVICE VERSION
-22/tcp open  ssh     Dropbear sshd 0.48 (protocol 2.0)
-23/tcp open  telnet  Busybox telnetd
-53/tcp open  domain  ISC Bind dnsmasq-2.35
-80/tcp open  http    OpenWrt BusyBox httpd
-MAC Address: 00:13:xx:xx:xx:xx (Cisco-Linksys)
-Service Info: Device: WAP
-\end{verbatim}
-
-The web server version, if identified, can be determining in knowing the Operating
-System. For instance, the \textbf{BOA} web server is typical from devices running 
-an open-source Unix or Unix-like.
-
-\subsubsection{Wireless Communications Fingerprinting}
-
-Although this method is not really known and widespread, using a wireless scanner 
-to discover which OS your router or Access Point run can be used. We do not have
-a clear example of how this could be achieved, but you will have to monitor raw 
-802.11 frames and compare them to a very similar device running a Linux based firmware.
-
-\subsubsection{Web server security exploits}
-
-The Linksys WRT54G was originally hacked by using a "ping bug" discovered in the 
-web interface. This tip has not been fixed for months by Linksys, allowing people
-to enable the "boot\_wait" helper process via the web interface. Many web servers
-used in firmwares are open source web server, thus allowing the code to be audited
-to find an exploit. Once you know the web server version that runs on your device,
-by using \textbf{nmap -sV} or so, you might be interested in using exploits to reach 
-shell access on your device.
-
-\subsubsection{Native Telnet/SSH access}
-
-Some firmwares might have restricted or unrestricted Telnet/SSH access, if so,
-try to log in with the web interface login/password and see if you can type in 
-some commands. This is actually the case for some Broadcom BCM963xx based firmwares
-such as the one in Neuf/Cegetel ISP routers, Club-Internet ISP CI-Box and many 
-others. Some commands, like \textbf{cat} might be left here and be used to 
-determine the Linux kernel version.
-
-\subsubsection{Analysing a binary firmware image}
-
-You are very likely to find a firmware binary image on the manufacturer website,
-even if your device runs a proprietary operating system. If so, you can download
-it and use an hexadecimal editor to find printable words such as \textbf{vmlinux},
-\textbf{linux}, \textbf{ramdisk}, \textbf{mtd} and others.
-
-Some Unix tools like \textbf{hexdump} or \textbf{strings} can be used to analyse 
-the firmware. Below there is an example with a binary firmware found other the Internet:
-
-\begin{verbatim}
-hexdump -C <binary image.extension> | less (more)
-00000000  46 49 52 45 32 2e 35 2e  30 00 00 00 00 00 00 00  |FIRE2.5.0.......|
-00000010  00 00 00 00 31 2e 30 2e  30 00 00 00 00 00 00 00  |....1.0.0.......|
-00000020  00 00 00 00 00 00 00 38  00 43 36 29 00 0a e6 dc  |.......8.C6)..??|
-00000030  54 49 44 45 92 89 54 66  1f 8b 08 08 f8 10 68 42  |TIDE..Tf....?.hB|
-00000040  02 03 72 61 6d 64 69 73  6b 00 ec 7d 09 bc d5 d3  |..ramdisk.?}.???|
-00000050  da ff f3 9b f7 39 7b ef  73 f6 19 3b 53 67 ea 44  |???.?9{?s?.;Sg?D|
-\end{verbatim}
-
-Scroll over the firmware to find printable words that can be significant.
-
-\subsubsection{Amount of flash memory}
-
-Linux can hardly fit in a 2MB flash device, once you have opened the device and 
-located the flash chip, try to find its characteristics on the Internet. If
-your flash chip is a 2MB or less device, your device is most likely to run a 
-proprietary OS such as WindRiver VxWorks, or a custom manufacturer OS like Zyxel ZynOS.
-
-OpenWrt does not currently run on devices which have 2MB or less of flash memory.
-This limitation will probably not be worked around since those devices are most 
-of the time micro-routers, or Wireless Access Points, which are not the main 
-OpenWrt target.
-
-\subsubsection{Pluging a serial port}
-
-By using a serial port and a level shifter, you may reach the console that is being shown by the device
-for debugging or flashing purposes. By analysing the output of this device, you can
-easily notice if the device uses a Linux kernel or something different.
-
-\subsection{Finding and using the manufacturer SDK}
-
-Once you are sure your device run a Linux based firmware, you will be able to start
-hacking on it. If the manufacturer respected the GPL, it will have released a Sample
-Development Kit with the device.
-
-\subsubsection{GPL violations}
-
-Some manufacturers do release a Linux based binary firmware, with no sources at all.
-The first step before doing anything is to read the license coming with your device,
-then write them about this lack of Open Source code. If the manufacturer answers
-you they do not have to release a SDK containing Open Source software, then we 
-recommend you get in touch with the gpl-violations.org community.
-
-You will find below a sample letter that can be sent to the manufacturer:
-
-\begin{verse}
-Miss, Mister,
-
-I am using a <device name>, and I cannot find neither on your website nor on the 
-CD-ROM the open source software used to build or modify the firmware.
-
-In conformance to the GPL license, you have to release the following sources:
-
-\begin{itemize}
-\item complete toolchain that made the kernel and applications be compiled (gcc, binutils, libc)
-\item tools to build a custom firmware (mksquashfs, mkcramfs ...)
-\item kernel sources with patches to make it run on this specific hardware, this does not include binary drivers
-\end{itemize}
-
-Thank you very much in advance for your answer.
-
-Best regards, <your name>
-\end{verse}
-
-\subsubsection{Using the SDK}
-
-Once the SDK is available, you are most likely not to be able to build a complete
-or functional firmware using it, but parts of it, like only the kernel, or only
-the root filesystem. Most manufacturers do not really care releasing a tool that
-do work every time you uncompress and use it.
-
-You should anyway be able to use the following components:
-
-\begin{itemize}
-\item kernel sources with more or less functional patches for your hardware
-\item binary drivers linked or to be linked with the shipped kernel version
-\item packages of the toolchain used to compile the whole firmware: gcc, binutils, libc or uClibc
-\item binary tools to create a valid firmware image
-\end{itemize}
-
-Your work can be divided into the following tasks:
-
-\begin{itemize}
-\item create a clean patch of the hardware specific part of the linux kernel
-\item spot potential kernel GPL violations especially on netfilter and USB stack stuff
-\item make the binary drivers work, until there are open source drivers
-\item use standard a GNU toolchain to make working executables
-\item understand and write open source tools to generate a valid firmware image
-\end{itemize}
-
-\subsubsection{Creating a hardware specific kernel patch}
-
-Most of the time, the kernel source that comes along with the SDK is not really 
-clean, and is not a standard Linux version, it also has architecture specific 
-fixes backported from the \textbf{CVS} or the \textbf{git} repository of the 
-kernel development trees. Anyway, some parts can be easily isolated and used as 
-a good start to make a vanilla kernel work your hardware.
-
-Some directories are very likely to have local modifications needed to make your
-hardware be recognized and used under Linux. First of all, you need to find out 
-the linux kernel version that is used by your hardware, this can be found by 
-editing the \textbf{linux/Makefile} file.
-
-\begin{verbatim}
-head -5 linux-2.x.x/Makefile
-VERSION = 2
-PATCHLEVEL = x
-SUBLEVEL = y
-EXTRAVERSION = z
-NAME=A fancy name
-\end{verbatim}
-
-So now, you know that you have to download a standard kernel tarball at 
-\textbf{kernel.org} that matches the version being used by your hardware.
-
-Then you can create a \textbf{diff} file between the two trees, especially for the 
-following directories:
-
-\begin{verbatim}
-diff -urN linux-2.x.x/arch/<sub architecture> linux-2.x.x-modified/arch/<sub architecture> > 01-architecture.patch
-diff -urN linux-2.x.x/include/ linux-2.x.x-modified/include > 02-includes.patch
-diff -urN linux-2.x.x/drivers/ linux-2.x.x-modified/drivers > 03-drivers.patch
-\end{verbatim}
-
-This will constitute a basic set of three patches that are very likely to contain
-any needed modifications that has been made to the stock Linux kernel to run on 
-your specific device. Of course, the content produced by the \textbf{diff -urN} 
-may not always be relevant, so that you have to clean up those patches to only 
-let the "must have" code into them.
-
-The first patch will contain all the code that is needed by the board to be 
-initialized at startup, as well as processor detection and other boot time 
-specific fixes.
-
-The second patch will contain all useful definitions for that board: addresses, 
-kernel granularity, redefinitions, processor family and features ...
-
-The third patch may contain drivers for: serial console, ethernet NIC, wireless 
-NIC, USB NIC ... Most of the time this patch contains nothing else than "glue"
-code that has been added to make the binary driver work with the Linux kernel. 
-This code might not be useful if you plan on writing drivers from scratch for 
-this hardware.
-
-\subsubsection{Using the device bootloader}
-
-The bootloader is the first program that is started right after your device has 
-been powered on. This program, can be more or less sophisticated, some do let you 
-do network booting, USB mass storage booting ... The bootloader is device and 
-architecture specific, some bootloaders were designed to be universal such as 
-RedBoot or U-Boot so that you can meet those loaders on totally different 
-platforms and expect them to behave the same way.
-
-If your device runs a proprietary operating system, you are very likely to deal 
-with a proprietary boot loader as well. This may not always be a limitation, 
-some proprietary bootloaders can even have source code available (i.e : Broadcom CFE).
-
-According to the bootloader features, hacking on the device will be more or less 
-easier. It is very probable that the bootloader, even exotic and rare, has a 
-documentation somewhere over the Internet. In order to know what will be possible 
-with your bootloader and the way you are going to hack the device, look over the 
-following features :
-
-\begin{itemize}
-\item does the bootloader allow net booting via bootp/DHCP/NFS or tftp
-\item does the bootloader accept loading ELF binaries ?
-\item does the bootloader have a kernel/firmware size limitation ?
-\item does the bootloader expect a firmware format to be loaded with ?
-\item are the loaded files executed from RAM or flash ?
-\end{itemize}
-
-Net booting is something very convenient, because you will only have to set up network
-booting servers on your development station, and keep the original firmware on the device
-till you are sure you can replace it. This also prevents your device from being flashed,
-and potentially bricked every time you want to test a modification on the kernel/filesystem.
-
-If your device needs to be flashed every time you load a firmware, the bootlader might
-only accept a specific firmware format to be loaded, so that you will have to 
-understand the firmware format as well.
-
-\subsubsection{Making binary drivers work}
-
-As we have explained before, manufacturers do release binary drivers in their GPL
-tarball. When those drivers are statically linked into the kernel, they become GPL
-as well, fortunately or unfortunately, most of the drivers are not statically linked.
-This anyway lets you a chance to dynamically link the driver with the current kernel
-version, and try to make them work together.
-
-This is one of the most tricky and grey part of the fully open source projects. 
-Some drivers require few modifications to be working with your custom kernel, 
-because they worked with an earlier kernel, and few modifications have been made
-to the kernel in-between those versions. This is for instance the case with the 
-binary driver of the Broadcom BCM43xx Wireless Chipsets, where only few differences
-were made to the network interface structures.
-
-Some general principles can be applied no matter which kernel version is used in
-order to make binary drivers work with your custom kernel:
-
-\begin{itemize}
-\item turn on kernel debugging features such as:
-\begin{itemize}
-\item CONFIG\_DEBUG\_KERNEL
-\item CONFIG\_DETECT\_SOFTLOCKUP
-\item CONFIG\_DEBUG\_KOBJECT
-\item CONFIG\_KALLSYMS
-\item CONFIG\_KALLSYMS\_ALL
-\end{itemize}
-\item link binary drivers when possible to the current kernel version
-\item try to load those binary drivers
-\item catch the lockups and understand them
-\end{itemize}
-
-Most of the time, loading binary drivers will fail, and generate a kernel oops. 
-You can know the last symbol the binary drivers attempted to use, and see in the
-kernel headers file, if you do not have to move some structures field before or 
-after that symbol in order to keep compatibily with both the binary driver and 
-the stock kernel drivers.
-
-\subsubsection{Understanding the firmware format}
-
-You might want to understand the firmware format, even if you are not yet capable
-of running a custom firmware on your device, because this is sometimes a blocking
-part of the flashing process.
-
-A firmware format is most of the time composed of the following fields:
-
-\begin{itemize}
-\item header, containing a firmware version and additional fields: Vendor, Hardware version ...
-\item CRC32 checksum on either the whole file or just part of it
-\item Binary and/or compressed kernel image
-\item Binary and/or compressed root filesystem image
-\item potential garbage
-\end{itemize}
-
-Once you have figured out how the firmware format is partitioned, you will have 
-to write your own tool that produces valid firmware binaries. One thing to be very
-careful here is the endianness of either the machine that produces the binary 
-firmware and the device that will be flashed using this binary firmware.
-
-\subsubsection{Writing a flash map driver}
-
-The flash map driver has an important role in making your custom firmware work 
-because it is responsible of mapping the correct flash regions and associated 
-rights to specific parts of the system such as: bootloader, kernel, user filesystem.
-
-Writing your own flash map driver is not really a hard task once you know how your
-firmware image and flash is structured. You will find below a commented example
-that covers the case of the device where the bootloader can pass to the kernel its partition plan.
-
-First of all, you need to make your flash map driver be visible in the kernel 
-configuration options, this can be done by editing the file \
-\textbf{linux/drivers/mtd/maps/Kconfig}:
-
-\begin{verbatim}
-config MTD_DEVICE_FLASH
-        tristate "Device Flash device"
-        depends on ARCHITECTURE && DEVICE
-        help
-         Flash memory access on DEVICE boards. Currently only works with
-         Bootloader Foo and Bootloader Bar.
-\end{verbatim}
-
-Then add your source file to the \textbf{linux/drivers/mtd/maps/Makefile}, so 
-that it will be compiled along with the kernel.
-
-\begin{verbatim}
-obj-\$(CONFIG_MTD_DEVICE_FLASH)      += device-flash.o
-\end{verbatim}
-
-You can then write the kernel driver itself, by creating a 
-\textbf{linux/drivers/mtd/maps/device-flash.c} C source file.
-
-\begin{verbatim}
-// Includes that are required for the flash map driver to know of the prototypes:
-#include <asm/io.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/vmalloc.h>
-
-// Put some flash map definitions here:
-#define WINDOW_ADDR 0x1FC00000         /* Real address of the flash */
-#define WINDOW_SIZE 0x400000                /* Size of flash */
-#define BUSWIDTH 2                                   /* Buswidth */
-
-static void __exit device_mtd_cleanup(void);
-
-static struct mtd_info *device_mtd_info;
-
-static struct map_info devicd_map = {
-       .name = "device",
-       .size = WINDOW_SIZE,
-       .bankwidth = BUSWIDTH,
-       .phys = WINDOW_ADDR,
-};
-
-static int __init device_mtd_init(void)
-{
-	  // Display that we found a flash map device 
-       printk("device: 0x\%08x at 0x\%08x\n", WINDOW_SIZE, WINDOW_ADDR);
-	   // Remap the device address to a kernel address
-       device_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
-
-       // If impossible to remap, exit with the EIO error
-       if (!device_map.virt) {
-               printk("device: Failed to ioremap\n");
-               return -EIO;
-       }
-
-	   // Initialize the device map
-       simple_map_init(&device_map);
-
-	   /* MTD informations are closely linked to the flash map device
-	       you might also use "jedec_probe" "amd_probe" or "intel_probe" */
-       device_mtd_info = do_map_probe("cfi_probe", &device_map);
-
- 		if (device_mtd_info) {
-               device_mtd_info->owner = THIS_MODULE;
-
-				int parsed_nr_parts = 0;
-
-						// We try here to use the partition schema provided by the bootloader specific code
-                       if (parsed_nr_parts == 0) {
-                               int ret = parse_bootloader_partitions(device_mtd_info, &parsed_parts, 0);
-                               if (ret > 0) {
-                                       part_type = "BootLoader";
-                                       parsed_nr_parts = ret;
-                               }
-                       }
-
-                       add_mtd_partitions(devicd_mtd_info, parsed_parts, parsed_nr_parts);
-
-                       return 0;
-               }
-       iounmap(device_map.virt);
-
-       return -ENXIO;
-}
-
-// This function will make the driver clean up the MTD device mapping
-static void __exit device_mtd_cleanup(void)
-{
-	  // If we found a MTD device before
-       if (device_mtd_info) {
-			   // Delete every partitions
-               del_mtd_partitions(device_mtd_info);
-			   // Delete the associated map
-               map_destroy(device_mtd_info);
-       }
-	
-		// If the virtual address is already in use
-       if (device_map.virt) {
-					// Unmap the physical address to a kernel space address
-               iounmap(device_map.virt);
-				// Reset the structure field
-              device_map.virt = 0;
-       }
-}
-
-
-// Macros that indicate which function is called on loading/unloading the module
-module_init(device_mtd_init);
-module_exit(device_mtd_cleanup);
-
-
-// Macros defining license and author, parameters can be defined here too.
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Me, myself and I <memyselfandi@domain.tld");
-\end{verbatim}
-
-\subsection{Adding your target in OpenWrt}
-
-Once you spotted the key changes that were made to the Linux kernel
-to support your target, you will want to create a target in OpenWrt
-for your hardware. This can be useful to benefit from the toolchain
-that OpenWrt builds as well as the resulting user-space and kernel
-configuration options.
-
-Provided that your target is already known to OpenWrt, it will be
-as simple as creating a \texttt{target/linux/board} directory
-where you will be creating the following directories and files.
-
-Here for example, is a \texttt{target/linux/board/Makefile}:
-
-\begin{Verbatim}[frame=single,numbers=left]
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=mips
-BOARD:=board
-BOARDNAME:=Eval board
-FEATURES:=squashfs jffs2 pci usb
-
-LINUX_VERSION:=2.6.27.10
-
-include $(INCLUDE_DIR)/target.mk
-
-DEFAULT_PACKAGES += hostapd-mini
-
-define Target/Description
-        Build firmware images for Evaluation board
-endef
-
-$(eval $(call BuildTarget))
-\end{Verbatim}
-
-\begin{itemize}
-    \item \texttt{ARCH} \\
-        The name of the architecture known by Linux and uClibc
-    \item \texttt{BOARD} \\
-        The name of your board that will be used as a package and build directory identifier
-    \item \texttt{BOARDNAME} \\
-        Expanded name that will appear in menuconfig
-    \item \texttt{FEATURES} \\
-        Set of features to build filesystem images, USB, PCI, VIDEO kernel support
-    \item \texttt{LINUX\_VERSION} \\
-        Linux kernel version to use for this target
-    \item \texttt{DEFAULT\_PACKAGES} \\
-        Set of packages to be built by default
-\end{itemize}
-
-A partial kernel configuration which is either named \texttt{config-default} or which matches the kernel version \texttt{config-2.6.x} should be present in \texttt{target/linux/board/}.
-This kernel configuration will only contain the relevant symbols to support your target and can be changed using \texttt{make kernel\_menuconfig}.
-
-To patch the kernel sources with the patches required to support your hardware, you will have to drop them in \texttt{patches} or in \texttt{patches-2.6.x} if there are specific
-changes between kernel versions. Additionnaly, if you want to avoid creating a patch that will create files, you can put those files into \texttt{files} or \texttt{files-2.6.x}
-with the same directory structure that the kernel uses (e.g: drivers/mtd/maps, arch/mips ..).
-
-The build system will require you to create a \texttt{target/linux/board/image/Makefile}:
-
-\begin{Verbatim}[frame=single,numbers=left]
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/BuildKernel
-        cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.elf
-        gzip -9n -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
-        $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7
-        dd if=$(KDIR)/vmlinux.bin.l7 of=$(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma bs=65536 conv=sync
-        dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/openwrt-$(BOARD)-vmlinux.gz bs=65536 conv=sync
-endef
-
-define Image/Build/squashfs
-    $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-endef
-
-define Image/Build
-        $(call Image/Build/$(1))
-        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync
-
-        -$(STAGING_DIR_HOST)/bin/mkfwimage \
-                -B XS2 -v XS2.ar2316.OpenWrt \
-                -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
-                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
-                -o $(BIN_DIR)/openwrt-$(BOARD)-ubnt2-$(1).bin
-endef
-
-$(eval $(call BuildImage))
-
-\end{Verbatim}
-
-\begin{itemize}
-    \item \texttt{Image/BuildKernel} \\
-        This template defines changes to be made to the ELF kernel file
-    \item \texttt{Image/Build} \\
-	This template defines the final changes to apply to the rootfs and kernel, either combined or separated
-	firmware creation tools can be called here as well.
-\end{itemize}
--- a/docs/bugs.tex
+++ b/docs/bugs.tex
@@ -1,52 +0,0 @@
-OpenWrt as an open source software opens its development to the community by
-having a publicly browseable subversion repository. The Trac software which
-comes along with a Subversion frontend,  a Wiki and a ticket reporting system 
-is used as an interface between developers, users and contributors in order to 
-make the whole development process much easier and efficient.
-
-We make distinction between two kinds of people within the Trac system:
-
-\begin{itemize}
-\item developers, able to report, close and fix tickets
-\item reporters, able to add a comment, patch, or request ticket status
-\end{itemize}
-
-\subsubsection{Opening a ticket}
-
-A reporter might want to open a ticket for the following reasons:
-
-\begin{itemize}
-\item a bug affects a specific hardware and/or software and needs to be fixed
-\item a specific software package would be seen as part of the official OpenWrt repository
-\item a feature should be added or removed from OpenWrt
-\end{itemize}
-
-Regarding the kind of ticket that is open, a patch is welcome in those cases:
-
-\begin{itemize}
-\item new package to be included in OpenWrt
-\item fix for a bug that works for the reporter and has no known side effect
-\item new features that can be added by modifying existing OpenWrt files
-\end{itemize}
-
-Once the ticket is open, a developer will take care of it, if so, the ticket is marked
-as "accepted" with the developer name. You can add comments at any time to the ticket,
-even when it is closed.
-
-\subsubsection{Closing a ticket}
-
-A ticket might be closed by a developer because:
-
-\begin{itemize}
-\item the problem is already fixed (wontfix)
-\item the problem described is not judged as valid, and comes along with an explanation why (invalid)
-\item the developers know that this bug will be fixed upstream (wontfix)
-\item the problem is very similar to something that has already been reported (duplicate)
-\item the problem cannot be reproduced by the developers (worksforme)
-\end{itemize}
-
-At the same time, the reporter may want to get the ticket closed since he is not 
-longer able to trigger the bug, or found it invalid by himself.
-
-When a ticket is closed by a developer and marked as "fixed", the comment contains 
-the subversion changeset which corrects the bug.
--- a/docs/build.tex
+++ b/docs/build.tex
@@ -1,594 +0,0 @@
-One of the biggest challenges to getting started with embedded devices is that you
-cannot just install a copy of Linux and expect to be able to compile a firmware.
-Even if you did remember to install a compiler and every development tool offered,
-you still would not have the basic set of tools needed to produce a firmware image.
-The embedded device represents an entirely new hardware platform, which is
-most of the time incompatible with the hardware on your development machine, so in a process called
-cross compiling you need to produce a new compiler capable of generating code for
-your embedded platform, and then use it to compile a basic Linux distribution to
-run on your device.
-
-The process of creating a cross compiler can be tricky, it is not something that is
-regularly attempted and so there is a certain amount of mystery and black magic
-associated with it. In many cases when you are dealing with embedded devices you will
-be provided with a binary copy of a compiler and basic libraries rather than
-instructions for creating your own -- it is a time saving step but at the same time
-often means you will be using a rather dated set of tools. Likewise, it is also common
-to be provided with a patched copy of the Linux kernel from the board or chip vendor,
-but this is also dated and it can be difficult to spot exactly what has been
-modified to make the kernel run on the embedded platform.
-
-\subsection{Building an image}
-
-OpenWrt takes a different approach to building a firmware; downloading, patching
-and compiling everything from scratch, including the cross compiler. To put it
-in simpler terms, OpenWrt does not contain any executables or even sources, it is an
-automated system for downloading the sources, patching them to work with the given
-platform and compiling them correctly for that platform. What this means is that
-just by changing the template, you can change any step in the process.
-
-As an example, if a new kernel is released, a simple change to one of the Makefiles
-will download the latest kernel, patch it to run on the embedded platform and produce
-a new firmware image -- there is no work to be done trying to track down an unmodified
-copy of the existing kernel to see what changes had been made, the patches are
-already provided and the process ends up almost completely transparent. This does not
-just apply to the kernel, but to anything included with OpenWrt -- It is this one
-simple understated concept which is what allows OpenWrt to stay on the bleeding edge
-with the latest compilers, latest kernels and latest applications.
-
-So let's take a look at OpenWrt and see how this all works.
-
-
-\subsubsection{Download OpenWrt}
-
-OpenWrt can be downloaded via subversion using the following command:
-
-\begin{Verbatim}
-$ svn checkout svn://svn.openwrt.org/openwrt/trunk openwrt-trunk
-\end{Verbatim}
-
-Additionally, there is a trac interface on \href{https://dev.openwrt.org/}{https://dev.openwrt.org/}
-which can be used to monitor svn commits and browse the source repository.
-
-
-\subsubsection{The directory structure}
-
-There are four key directories in the base:
-
-\begin{itemize}
-    \item \texttt{tools}
-    \item \texttt{toolchain}
-    \item \texttt{package}
-    \item \texttt{target}
-\end{itemize}
-
-\texttt{tools} and \texttt{toolchain} refer to common tools which will be
-used to build the firmware image, the compiler, and the C library.
-The result of this is three new directories, \texttt{build\_dir/host}, which is a temporary
-directory for building the target independent tools, \texttt{build\_dir/toolchain-\textit{<arch>}*}
-which is used for building the toolchain for a specific architecture, and
-\texttt{staging\_dir/toolchain-\textit{<arch>}*} where the resulting toolchain is installed.
-You will not need to do anything with the toolchain directory unless you intend to
-add a new version of one of the components above.
-
-\begin{itemize}
-    \item \texttt{build\_dir/host}
-    \item \texttt{build\_dir/toolchain-\textit{<arch>}*}
-\end{itemize}
-
-\texttt{package} is for exactly that -- packages. In an OpenWrt firmware, almost everything
-is an \texttt{.ipk}, a software package which can be added to the firmware to provide new
-features or removed to save space. Note that packages are also maintained outside of the main
-trunk and can be obtained from subversion using the package feeds system:
-
-\begin{Verbatim}
-$ ./scripts/feeds update
-\end{Verbatim}
-
-Those packages can be used to extend the functionality of the build system and need to be
-symlinked into the main trunk. Once you do that, the packages will show up in the menu for
-configuration. You would do something like this:
-
-\begin{Verbatim}
-$ ./scripts/feeds search nmap
-Search results in feed 'packages':
-nmap       Network exploration and/or security auditing utility
-
-$ ./scripts/feeds install nmap
-\end{Verbatim}
-
-To include all packages, issue the following command:
-
-\begin{Verbatim}
-$ make package/symlinks
-\end{Verbatim}
-
-\texttt{target} refers to the embedded platform, this contains items which are specific to
-a specific embedded platform. Of particular interest here is the "\texttt{target/linux}"
-directory which is broken down by platform \textit{<arch>} and contains the patches to the
-kernel, profile config, for a particular platform. There's also the "\texttt{target/image}" directory
-which describes how to package a firmware for a specific platform.
-
-Both the target and package steps will use the directory "\texttt{build\_dir/\textit{<arch>}}"
-as a temporary directory for compiling. Additionally, anything downloaded by the toolchain,
-target or package steps will be placed in the "\texttt{dl}" directory.
-
-\begin{itemize}
-    \item \texttt{build\_dir/\textit{<arch>}}
-    \item \texttt{dl}
-\end{itemize}
-
-\subsubsection{Building OpenWrt}
-
-While the OpenWrt build environment was intended mostly for developers, it also has to be
-simple enough that an inexperienced end user can easily build his or her own customized firmware.
-
-Running the command "\texttt{make menuconfig}" will bring up OpenWrt's configuration menu
-screen, through this menu you can select which platform you're targeting, which versions of
-the toolchain you want to use to build and what packages you want to install into the
-firmware image. Note that it will also check to make sure you have the basic dependencies for it
-to run correctly.  If that fails, you will need to install some more tools in your local environment
-before you can begin.
-
-Similar to the linux kernel config, almost every option has three choices,
-\texttt{y/m/n} which are represented as follows:
-
-\begin{itemize}
-    \item{\texttt{<*>} (pressing y)} \\
-        This will be included in the firmware image
-    \item{\texttt{<M>} (pressing m)} \\
-        This will be compiled but not included (for later install)
-    \item{\texttt{< >} (pressing n)} \\
-        This will not be compiled
-\end{itemize}
-
-After you've finished with the menu configuration, exit and when prompted, save your
-configuration changes.
-
-If you want, you can also modify the kernel config for the selected target system.
-simply run "\texttt{make kernel\_menuconfig}" and the build system will unpack the kernel sources
-(if necessary), run menuconfig inside of the kernel tree, and then copy the kernel config
-to \texttt{target/linux/\textit{<platform>}/config} so that it is preserved over
-"\texttt{make clean}" calls.
-
-To begin compiling the firmware, type "\texttt{make}". By default
-OpenWrt will only display a high level overview of the compile process and not each individual
-command.
-
-\subsubsection{Example:}
-
-\begin{Verbatim}
-make[2] toolchain/install
-make[3] -C toolchain install
-make[2] target/compile
-make[3] -C target compile
-make[4] -C target/utils prepare
-
-[...]
-\end{Verbatim}
-
-This makes it easier to monitor which step it's actually compiling and reduces the amount
-of noise caused by the compile output. To see the full output, run the command
-"\texttt{make V=99}".
-
-During the build process, buildroot will download all sources to the "\texttt{dl}"
-directory and will start patching and compiling them in the "\texttt{build\_dir/\textit{<arch>}}"
-directory. When finished, the resulting firmware will be in the "\texttt{bin}" directory
-and packages will be in the "\texttt{bin/packages}" directory.
-
-
-\subsection{Creating packages}
-
-One of the things that we've attempted to do with OpenWrt's template system is make it
-incredibly easy to port software to OpenWrt. If you look at a typical package directory
-in OpenWrt you'll find several things:
-
-\begin{itemize}
-    \item \texttt{package/\textit{<name>}/Makefile}
-    \item \texttt{package/\textit{<name>}/patches}
-    \item \texttt{package/\textit{<name>}/files}
-\end{itemize}
-
-The patches directory is optional and typically contains bug fixes or optimizations to
-reduce the size of the executable. The package makefile is the important item, provides
-the steps actually needed to download and compile the package.
-
-The files directory is also optional and typicall contains package specific startup scripts or default configuration files that can be used out of the box with OpenWrt.
-
-Looking at one of the package makefiles, you'd hardly recognize it as a makefile.
-Through what can only be described as blatant disregard and abuse of the traditional
-make format, the makefile has been transformed into an object oriented template which
-simplifies the entire ordeal.
-
-Here for example, is \texttt{package/bridge/Makefile}:
-
-\begin{Verbatim}[frame=single,numbers=left]
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bridge
-PKG_VERSION:=1.0.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/bridge
-PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bridge
-  SECTION:=net
-  CATEGORY:=Base system
-  TITLE:=Ethernet bridging configuration utility
-  URL:=http://bridge.sourceforge.net/
-endef
-
-define Package/bridge/description
-  Manage ethernet bridging: 
-  a way to connect networks together to form a larger network.
-endef
-
-define Build/Configure
-    $(call Build/Configure/Default, \
-        --with-linux-headers="$(LINUX_DIR)" \
-    )
-endef
-
-define Package/bridge/install
-    $(INSTALL_DIR) $(1)/usr/sbin
-    $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,bridge))
-\end{Verbatim}
-
-As you can see, there's not much work to be done; everything is hidden in other makefiles
-and abstracted to the point where you only need to specify a few variables.
-
-\begin{itemize}
-    \item \texttt{PKG\_NAME} \\
-        The name of the package, as seen via menuconfig and ipkg
-    \item \texttt{PKG\_VERSION} \\
-        The upstream version number that we are downloading
-    \item \texttt{PKG\_RELEASE} \\
-        The version of this package Makefile
-    \item \texttt{PKG\_SOURCE} \\
-        The filename of the original sources
-    \item \texttt{PKG\_SOURCE\_URL} \\
-        Where to download the sources from (no trailing slash), you can add multiple download sources by separating them with a \\ and a carriage return.
-    \item \texttt{PKG\_MD5SUM} \\
-        A checksum to validate the download
-    \item \texttt{PKG\_CAT} \\
-        How to decompress the sources (zcat, bzcat, unzip)
-    \item \texttt{PKG\_BUILD\_DIR} \\
-        Where to compile the package
-\end{itemize}
-
-The \texttt{PKG\_*} variables define where to download the package from;
-\texttt{@SF} is a special keyword for downloading packages from sourceforge. There is also
-another keyword of \texttt{@GNU} for grabbing GNU source releases. If any of the above mentionned download source fails, the OpenWrt mirrors will be used as source.
-
-The md5sum (if present) is used to verify the package was downloaded correctly and
-\texttt{PKG\_BUILD\_DIR} defines where to find the package after the sources are
-uncompressed into \texttt{\$(BUILD\_DIR)}.
-
-At the bottom of the file is where the real magic happens, "BuildPackage" is a macro
-set up by the earlier include statements. BuildPackage only takes one argument directly --
-the name of the package to be built, in this case "\texttt{bridge}". All other information
-is taken from the define blocks. This is a way of providing a level of verbosity, it's
-inherently clear what the contents of the \texttt{description} template in
-\texttt{Package/bridge} is, which wouldn't be the case if we passed this information
-directly as the Nth argument to \texttt{BuildPackage}.
-
-\texttt{BuildPackage} uses the following defines:
-
-\textbf{\texttt{Package/\textit{<name>}}:} \\
-    \texttt{\textit{<name>}} matches the argument passed to buildroot, this describes
-    the package the menuconfig and ipkg entries. Within \texttt{Package/\textit{<name>}}
-    you can define the following variables:
-
-    \begin{itemize}
-        \item \texttt{SECTION} \\
-            The section of package (currently unused)
-        \item \texttt{CATEGORY} \\
-            Which menu it appears in menuconfig: Network, Sound, Utilities, Multimedia ...
-        \item \texttt{TITLE} \\
-            A short description of the package
-        \item \texttt{URL} \\
-            Where to find the original software
-        \item \texttt{MAINTAINER} (optional) \\
-            Who to contact concerning the package
-        \item \texttt{DEPENDS} (optional) \\
-            Which packages must be built/installed before this package. To reference a dependency defined in the
-			same Makefile, use \textit{<dependency name>}. If defined as an external package, use 
-			\textit{+<dependency name>}. For a kernel version dependency use: \textit{@LINUX\_2\_<minor version>}
-		\item \texttt{BUILDONLY} (optional) \\
-			Set this option to 1 if you do NOT want your package to appear in menuconfig.
-			This is useful for packages which are only used as build dependencies.
-    \end{itemize}
-
-\textbf{\texttt{Package/\textit{<name>}/conffiles} (optional):} \\
-   A list of config files installed by this package, one file per line.
-
-\textbf{\texttt{Build/Prepare} (optional):} \\
-   A set of commands to unpack and patch the sources. You may safely leave this
-   undefined.
-
-\textbf{\texttt{Build/Configure} (optional):} \\
-   You can leave this undefined if the source doesn't use configure or has a
-   normal config script, otherwise you can put your own commands here or use
-   "\texttt{\$(call Build/Configure/Default,\textit{<first list of arguments, second list>})}" as above to
-   pass in additional arguments for a standard configure script. The first list of arguments will be passed
-   to the configure script like that: \texttt{--arg 1} \texttt{--arg 2}. The second list contains arguments that should be
-   defined before running the configure script such as autoconf or compiler specific variables.
-   
-   To make it easier to modify the configure command line, you can either extend or completely override the following variables:
-   \begin{itemize}
-     \item \texttt{CONFIGURE\_ARGS} \\
-	     Contains all command line arguments (format: \texttt{--arg 1} \texttt{--arg 2})
-     \item \texttt{CONFIGURE\_VARS} \\
-	     Contains all environment variables that are passed to ./configure (format: \texttt{NAME="value"})
-   \end{itemize}
-
-\textbf{\texttt{Build/Compile} (optional):} \\
-   How to compile the source; in most cases you should leave this undefined.
-   
-   As with \texttt{Build/Configure} there are two variables that allow you to override
-   the make command line environment variables and flags:
-   \begin{itemize}
-     \item \texttt{MAKE\_FLAGS} \\
-	   Contains all command line arguments (typically variable overrides like \texttt{NAME="value"}
-	 \item \texttt{MAKE\_VARS} \\
-	   Contains all environment variables that are passed to the make command
-   \end{itemize}
-
-\textbf{\texttt{Build/InstallDev} (optional):} \\
-	If your package provides a library that needs to be made available to other packages,
-	you can use the \texttt{Build/InstallDev} template to copy it into the staging directory
-	which is used to collect all files that other packages might depend on at build time.
-	When it is called by the build system, two parameters are passed to it. \texttt{\$(1)} points to
-	the regular staging dir, typically \texttt{staging\_dir/\textit{ARCH}}, while \texttt{\$(2)} points
-	to \texttt{staging\_dir/host}. The host staging dir is only used for binaries, which are
-	to be executed or linked against on the host and its \texttt{bin/} subdirectory is included
-	in the \texttt{PATH} which is passed down to the build system processes.
-	Please use \texttt{\$(1)} and \texttt{\$(2)} here instead of the build system variables
-	\texttt{\$(STAGING\_DIR)} and \texttt{\$(STAGING\_DIR\_HOST)}, because the build system behavior
-	when staging libraries might change in the future to include automatic uninstallation.
-
-\textbf{\texttt{Package/\textit{<name>}/install}:} \\
-   A set of commands to copy files out of the compiled source and into the ipkg
-   which is represented by the \texttt{\$(1)} directory. Note that there are currently
-   4 defined install macros:
-   \begin{itemize}
-       \item \texttt{INSTALL\_DIR} \\
-           install -d -m0755
-       \item \texttt{INSTALL\_BIN} \\
-           install -m0755
-       \item \texttt{INSTALL\_DATA} \\
-           install -m0644
-       \item \texttt{INSTALL\_CONF} \\
-           install -m0600
-   \end{itemize}
-
-The reason that some of the defines are prefixed by "\texttt{Package/\textit{<name>}}"
-and others are simply "\texttt{Build}" is because of the possibility of generating
-multiple packages from a single source. OpenWrt works under the assumption of one
-source per package Makefile, but you can split that source into as many packages as
-desired. Since you only need to compile the sources once, there's one global set of
-"\texttt{Build}" defines, but you can add as many "Package/<name>" defines as you want
-by adding extra calls to \texttt{BuildPackage} -- see the dropbear package for an example.
-
-After you have created your \texttt{package/\textit{<name>}/Makefile}, the new package
-will automatically show in the menu the next time you run "make menuconfig" and if selected
-will be built automatically the next time "\texttt{make}" is run.
-
-\subsection{Creating binary packages}
-
-You might want to create binary packages and include them in the resulting images as packages.
-To do so, you can use the following template, which basically sets to nothing the Configure and
-Compile templates.
-
-\begin{Verbatim}[frame=single,numbers=left]
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=binpkg
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=binpkg-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://server
-PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
-PKG_CAT:=zcat
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/binpkg
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Binary package
-endef
-
-define Package/bridge/description
-  Binary package
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/bridge/install
-    $(INSTALL_DIR) $(1)/usr/sbin
-    $(INSTALL_BIN) $(PKG_BUILD_DIR)/* $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,bridge))
-\end{Verbatim}
-
-Provided that the tarball which contains the binaries reflects the final
-directory layout (/usr, /lib ...), it becomes very easy to get your package
-look like one build from sources.
-
-Note that using the same technique, you can easily create binary pcakages
-for your proprietary kernel modules as well.
-
-\subsection{Creating kernel modules packages}
-
-The OpenWrt distribution makes the distinction between two kind of kernel modules, those coming along with the mainline kernel, and the others available as a separate project. We will see later that a common template is used for both of them.
-
-For kernel modules that are part of the mainline kernel source, the makefiles are located in \textit{package/kernel/modules/*.mk} and they appear under the section "Kernel modules"
-
-For external kernel modules, you can add them to the build system just like if they were software packages by defining a KernelPackage section in the package makefile.
-
-Here for instance the Makefile for the I2C subsytem kernel modules :
-
-\begin{Verbatim}[frame=single,numbers=left]
-
-I2CMENU:=I2C Bus
-
-define KernelPackage/i2c-core
-  TITLE:=I2C support
-  DESCRIPTION:=Kernel modules for i2c support
-  SUBMENU:=$(I2CMENU)
-  KCONFIG:=CONFIG_I2C_CORE CONFIG_I2C_DEV
-  FILES:=$(MODULES_DIR)/kernel/drivers/i2c/*.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,i2c-core i2c-dev)
-endef
-$(eval $(call KernelPackage,i2c-core))
-\end{Verbatim}
-
-To group kernel modules under a common description in menuconfig, you might want to define a \textit{<description>MENU} variable on top of the kernel modules makefile.
-
-\begin{itemize}
-    \item \texttt{TITLE} \\
-        The name of the module as seen via menuconfig
-    \item \texttt{DESCRIPTION} \\
-        The description as seen via help in menuconfig
-    \item \texttt{SUBMENU} \\
-        The sub menu under which this package will be seen
-    \item \texttt{KCONFIG} \\
-        Kernel configuration option dependency. For external modules, remove it.
-    \item \texttt{FILES} \\
-        Files you want to inlude to this kernel module package, separate with spaces.
-    \item \texttt{AUTOLOAD} \\
-        Modules that will be loaded automatically on boot, the order you write them is the order they would be loaded.
-\end{itemize}
-
-After you have created your \texttt{package/kernel/modules/\textit{<name>}.mk}, the new kernel modules package
-will automatically show in the menu under "Kernel modules" next time you run "make menuconfig" and if selected
-will be built automatically the next time "\texttt{make}" is run.
-
-\subsection{Conventions}
-
-There are a couple conventions to follow regarding packages:
-
-\begin{itemize}
-    \item \texttt{files}
-    \begin{enumerate}
-        \item configuration files follow the convention \\
-        \texttt{\textit{<name>}.conf}
-        \item init files follow the convention \\
-        \texttt{\textit{<name>}.init}
-    \end{enumerate}
-    \item \texttt{patches}
-    \begin{enumerate}
-        \item patches are numerically prefixed and named related to what they do
-    \end{enumerate}
-\end{itemize}
-
-\subsection{Troubleshooting}
-
-If you find your package doesn't show up in menuconfig, try the following command to
-see if you get the correct description:
-
-\begin{Verbatim}
-  TOPDIR=$PWD make -C package/<name> DUMP=1 V=99
-\end{Verbatim}
-
-If you're just having trouble getting your package to compile, there's a few
-shortcuts you can take. Instead of waiting for make to get to your package, you can
-run one of the following:
-
-\begin{itemize}
-    \item \texttt{make package/\textit{<name>}/clean V=99}
-    \item \texttt{make package/\textit{<name>}/install V=99}
-\end{itemize}
-
-Another nice trick is that if the source directory under \texttt{build\_dir/\textit{<arch>}}
-is newer than the package directory, it won't clobber it by unpacking the sources again.
-If you were working on a patch you could simply edit the sources under the
-\texttt{build\_dir/\textit{<arch>}/\textit{<source>}} directory and run the install command above,
-when satisfied, copy the patched sources elsewhere and diff them with the unpatched
-sources. A warning though - if you go modify anything under \texttt{package/\textit{<name>}}
-it will remove the old sources and unpack a fresh copy.
-
-Other useful targets include:
-
-\begin{itemize}
-    \item \texttt{make package/\textit{<name>}/prepare V=99}
-    \item \texttt{make package/\textit{<name>}/compile V=99}
-    \item \texttt{make package/\textit{<name>}/configure V=99}
-\end{itemize}
-
-
-\subsection{Using build environments}
-OpenWrt provides a means of building images for multiple configurations
-which can use multiple targets in one single checkout. These \emph{environments}
-store a copy of the .config file generated by \texttt{make menuconfig} and the contents
-of the \texttt{./files} folder.
-The script \texttt{./scripts/env} is used to manage these environments, it uses
-\texttt{git} (which needs to be installed on your system) as backend for version control.
-
-The command 
-\begin{Verbatim}
-  ./scripts/env help
-\end{Verbatim}
-produces a short help text with a list of commands.
-
-To create a new environment named \texttt{current}, run the following command
-\begin{Verbatim}
-  ./scripts/env new current
-\end{Verbatim}
-This will move your \texttt{.config} file and \texttt{./files} (if it exists) to
-the \texttt{env/} subdirectory and create symlinks in the base folder.
-
-After running make menuconfig or changing things in files/, your current state will
-differ from what has been saved before. To show these changes, use:
-\begin{Verbatim}
-  ./scripts/env diff
-\end{Verbatim}
-
-If you want to save these changes, run:
-\begin{Verbatim}
-  ./scripts/env save
-\end{Verbatim}
-If you want to revert your changes to the previously saved copy, run:
-\begin{Verbatim}
-  ./scripts/env revert
-\end{Verbatim}
-
-If you want, you can now create a second environment using the \texttt{new} command.
-It will ask you whether you want to make it a clone of the current environment (e.g.
-for minor changes) or if you want to start with a clean version (e.g. for selecting
-a new target).
-
-To switch to a different environment (e.g. \texttt{test1}), use:
-\begin{Verbatim}
-  ./scripts/env switch test1
-\end{Verbatim}
-
-To rename the current branch to a new name (e.g. \texttt{test2}), use:
-\begin{Verbatim}
-  ./scripts/env rename test2
-\end{Verbatim}
-
-If you want to get rid of environment switching and keep everything in the base directory
-again, use:
-\begin{Verbatim}
-  ./scripts/env clear
-\end{Verbatim}
--- a/docs/config.tex
+++ b/docs/config.tex
@@ -1,101 +0,0 @@
-\subsubsection{Structure of the configuration files}
-
-The config files are divided into sections and options/values.
-
-Every section has a type, but does not necessarily have a name.
-Every option has a name and a value and is assigned to the section
-it was written under.
-
-Syntax:
-
-\begin{Verbatim}
-config      <type> ["<name>"]      # Section
-    option  <name> "<value>"       # Option
-\end{Verbatim}
-
-Every parameter needs to be a single string and is formatted exactly
-like a parameter for a shell function. The same rules for Quoting and
-special characters also apply, as it is parsed by the shell.
-
-\subsubsection{Parsing configuration files in custom scripts}
-
-To be able to load configuration files, you need to include the common
-functions with:
-
-\begin{Verbatim}
-. /lib/functions.sh
-\end{Verbatim}
-
-Then you can use \texttt{config\_load \textit{<name>}} to load config files. The function
-first checks for \textit{<name>} as absolute filename and falls back to loading
-it from \texttt{/etc/config} (which is the most common way of using it).
-
-If you want to use special callbacks for sections and/or options, you
-need to define the following shell functions before running \texttt{config\_load}
-(after including \texttt{/lib/functions.sh}):
-
-\begin{Verbatim}
-config_cb() {
-    local type="$1"
-    local name="$2"
-    # commands to be run for every section
-}
-
-option_cb() {
-    # commands to be run for every option
-}
-\end{Verbatim}
-
-You can also alter \texttt{option\_cb} from \texttt{config\_cb} based on the section type.
-This allows you to process every single config section based on its type
-individually.
-
-\texttt{config\_cb} is run every time a new section starts (before options are being
-processed). You can access the last section through the \texttt{CONFIG\_SECTION}
-variable. Also an extra call to \texttt{config\_cb} (without a new section) is generated
-after \texttt{config\_load} is done.
-That allows you to process sections both before and after all options were
-processed.
-
-Another way of iterating on config sections is using the \texttt{config\_foreach} command.
-
-Syntax:
-\begin{Verbatim}
-config_foreach <function name> [<sectiontype>] [<arguments...>]
-\end{Verbatim}
-
-This command will run the supplied function for every single config section in the currently
-loaded config. The section name will be passed to the function as argument 1.
-If the section type is added to the command line, the function will only be called for
-sections of the given type.
-
-
-You can access already processed options with the \texttt{config\_get} command
-Syntax:
-
-\begin{Verbatim}
-# print the value of the option
-config_get <section> <option>
-
-# store the value inside the variable
-config_get <variable> <section> <option>
-\end{Verbatim}
-
-In busybox ash the three-option \texttt{config\_get} is faster, because it does not
-result in an extra fork, so it is the preferred way.
-
-Additionally you can also modify or add options to sections by using the
-\texttt{config\_set} command.
-
-Syntax:
-
-\begin{Verbatim}
-config_set <section> <option> <value>
-\end{Verbatim}
-
-If a config section is unnamed, an automatically generated name will
-be assigned internally, e.g. \texttt{cfg1}, \texttt{cfg2}, ...
-
-While it is possible, using unnamed sections through these autogenerated names is
-strongly discouraged. Use callbacks or \texttt{config\_foreach} instead.
-
--- a/docs/debugging.tex
+++ b/docs/debugging.tex
@@ -1,61 +0,0 @@
-Debugging hardware can be tricky especially when doing kernel and drivers
-development. It might become handy for you to add serial console to your
-device as well as using JTAG to debug your code.
-
-\subsection{Adding a serial port}
-
-Most routers come with an UART integrated into the System-on-chip
-and its pins are routed on the Printed Circuit Board to allow
-debugging, firmware replacement or serial device connection (like
-modems).
-
-Finding an UART on a router is fairly easy since it only needs at
-least 4 signals (without modem signaling) to work : VCC, GND, TX and
-RX. Since your router is very likely to have its I/O pins working at
-3.3V (TTL level), you will need a level shifter such as a Maxim MAX232
-to change the level from 3.3V to your computer level which is usually
-at 12V.
-
-To find out the serial console pins on the PCB, you will be looking
-for a populated or unpopulated 4-pin header, which can be far from
-the SoC (signals are relatively slow) and usually with tracks on
-the top or bottom layer of the PCB, and connected to the TX and RX.
-
-Once found, you can easily check where is GND, which is connected to
-the same ground layer than the power connector. VCC should be fixed
-at 3.3V and connected to the supply layer, TX is also at 3.3V level
-but using a multimeter as an ohm-meter and showing an infinite
-value between TX and VCC pins will tell you about them being different
-signals (or not). RX and GND are by default at 0V, so using the same
-technique you can determine the remaining pins like this.
-
-If you do not have a multimeter a simple trick that usually works is
-using a speaker or a LED to determine the 3.3V signals. Additionnaly
-most PCB designer will draw a square pad to indicate ping number 1.
-
-Once found, just interface your level shifter with the device and the
-serial port on the PC on the other side. Most common baudrates for the
-off-the-shelf devices are 9600, 38400 and 115200 with 8-bits data, no
-parity, 1-bit stop.
-
-\subsection{JTAG}
-
-JTAG stands for Joint Test Action Group, which is an IEEE workgroup
-defining an electrical interface for integrated circuit testing and
-programming.
-
-There is usually a JTAG automate integrated into your System-on-Chip
-or CPU which allows an external software, controlling the JTAG adapter
-to make it perform commands like reads and writes at arbitray locations.
-Additionnaly it can be useful to recover your devices if you erased the
-bootloader resident on the flash.
-
-Different CPUs have different automates behavior and reset sequence,
-most likely you will find ARM and MIPS CPUs, both having their standard
-to allow controlling the CPU behavior using JTAG.
-
-Finding JTAG connector on a PCB can be a little easier than finding the
-UART since most vendors leave those headers unpopulated after production.
-JTAG connectors are usually 12, 14, or 20-pins headers with one side of
-the connector having some signals at 3.3V and the other side being
-connected to GND.
--- a/docs/init-scripts.tex
+++ b/docs/init-scripts.tex
@@ -1,60 +0,0 @@
-Because OpenWrt uses its own init script system, all init scripts must be installed
-as \texttt{/etc/init.d/\textit{name}} use \texttt{/etc/rc.common} as a wrapper.
-
-Example: \texttt{/etc/init.d/httpd}
-
-\begin{Verbatim}
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=50
-start() {
-    [ -d /www ] && httpd -p 80 -h /www -r OpenWrt
-}
-
-stop() {
-    killall httpd
-}
-\end{Verbatim}
-
-as you can see, the script does not actually parse the command line arguments itself.
-This is done by the wrapper script \texttt{/etc/rc.common}.
-
-\texttt{start()} and \texttt{stop()} are the basic functions, which almost any init
-script should provide. \texttt{start()} is called when the user runs \texttt{/etc/init.d/httpd start}
-or (if the script is enabled and does not override this behavior) at system boot time.
-
-Enabling and disabling init scripts is done by running \texttt{/etc/init.d/\textit{name} enable}
-or \texttt{/etc/init.d/\textit{name} disable}. This creates or removes symbolic links to the
-init script in \texttt{/etc/rc.d}, which is processed by \texttt{/etc/init.d/rcS} at boot time.
-
-The order in which these scripts are run is defined in the variable \texttt{START} in the init
-script. Changing it requires running \texttt{/etc/init.d/\textit{name} enable} again.
-
-You can also override these standard init script functions:
-\begin{itemize}
-    \item \texttt{boot()} \\
-        Commands to be run at boot time. Defaults to \texttt{start()}
-
-    \item \texttt{restart()} \\
-        Restart your service. Defaults to \texttt{stop(); start()}
-
-    \item \texttt{reload()} \\
-        Reload the configuration files for your service. Defaults to \texttt{restart()}
-
-\end{itemize}
-
-You can also add custom commands by creating the appropriate functions and referencing them
-in the \texttt{EXTRA\_COMMANDS} variable. Helptext is added in \texttt{EXTRA\_HELP}.
-
-Example:
-
-\begin{Verbatim}
-status() {
-    # print the status info
-}
-
-EXTRA_COMMANDS="status"
-EXTRA_HELP="        status  Print the status of the service"
-\end{Verbatim}
-
--- a/docs/network-scripts.tex
+++ b/docs/network-scripts.tex
@@ -1,55 +0,0 @@
-\subsubsection{Using the network scripts}
-
-To be able to access the network functions, you need to include
-the necessary shell scripts by running:
-
-\begin{Verbatim}
-. /lib/functions.sh      # common functions
-include /lib/network     # include /lib/network/*.sh
-scan_interfaces          # read and parse the network config
-\end{Verbatim}
-
-Some protocols, such as PPP might change the configured interface names
-at run time (e.g. \texttt{eth0} => \texttt{ppp0} for PPPoE). That's why you have to run
-\texttt{scan\_interfaces} instead of reading the values from the config directly.
-After running \texttt{scan\_interfaces}, the \texttt{'ifname'} option will always contain
-the effective interface name (which is used for IP traffic) and if the
-physical device name differs from it, it will be stored in the \texttt{'device'}
-option.
-That means that running \texttt{config\_get lan ifname}
-after \texttt{scan\_interfaces} might not return the same result as running it before.
-
-After running \texttt{scan\_interfaces}, the following functions are available:
-
-\begin{itemize}
-    \item{\texttt{find\_config \textit{interface}}} \\
-        looks for a network configuration that includes
-        the specified network interface.
-
-    \item{\texttt{setup\_interface \textit{interface [config] [protocol]}}} \\
-      will set up the specified interface, optionally overriding the network configuration
-      name or the protocol that it uses.
-\end{itemize}
-
-\subsubsection{Writing protocol handlers}
-
-You can add custom protocol handlers (e.g: PPPoE, PPPoA, ATM, PPTP ...)
-by adding shell scripts to \texttt{/lib/network}. They provide the following
-two shell functions:
-
-\begin{Verbatim}
-scan_<protocolname>() {
-    local config="$1"
-    # change the interface names if necessary
-}
-
-setup_interface_<protocolname>() {
-    local interface="$1"
-    local config="$2"
-    # set up the interface
-}
-\end{Verbatim}
-
-\texttt{scan\_\textit{protocolname}} is optional and only necessary if your protocol
-uses a custom device, e.g. a tunnel or a PPP device.
-
--- a/docs/network.tex
+++ b/docs/network.tex
@@ -1,231 +0,0 @@
-The network configuration is stored in \texttt{/etc/config/network}
-and is divided into interface configurations.
-Each interface configuration either refers directly to an ethernet/wifi
-interface (\texttt{eth0}, \texttt{wl0}, ..) or to a bridge containing multiple interfaces.
-It looks like this:
-
-\begin{Verbatim}
-config interface     "lan"
-    option ifname    "eth0"
-    option proto     "static"
-    option ipaddr    "192.168.1.1"
-    option netmask   "255.255.255.0"
-    option gateway   "192.168.1.254"
-    option dns       "192.168.1.254"
-\end{Verbatim}
-
-\texttt{ifname} specifies the Linux interface name.
-If you want to use bridging on one or more interfaces, set \texttt{ifname} to a list
-of interfaces and add:
-\begin{Verbatim}
-    option type     "bridge"
-\end{Verbatim}
-
-It is possible to use VLAN tagging on an interface simply by adding the VLAN IDs
-to it, e.g. \texttt{eth0.15}. These can be nested as well. See the switch section for
-this.
-
-\begin{Verbatim}
-config interface
-    option ifname    "eth0.15"
-    option proto     "none"
-\end{Verbatim}
-
-This sets up a simple static configuration for \texttt{eth0}. \texttt{proto} specifies the
-protocol used for the interface. The default image usually provides \texttt{'none'}
-\texttt{'static'}, \texttt{'dhcp'} and \texttt{'pppoe'}. Others can be added by installing additional
-packages.
-
-When using the \texttt{'static'} method like in the example, the  options \texttt{ipaddr} and
-\texttt{netmask} are mandatory, while \texttt{gateway} and \texttt{dns} are optional.
-You can specify more than one DNS server, separated with spaces:
-
-\begin{Verbatim}
-config interface     "lan"
-    option ifname    "eth0"
-    option proto     "static"
-    ...
-    option dns       "192.168.1.254 192.168.1.253" (optional)
-\end{Verbatim}
-
-DHCP currently only accepts \texttt{ipaddr} (IP address to request from the server)
-and \texttt{hostname} (client hostname identify as) - both are optional.
-
-\begin{Verbatim}
-config interface     "lan"
-    option ifname    "eth0"
-    option proto     "dhcp"
-    option ipaddr    "192.168.1.1" (optional)
-    option hostname  "openwrt"     (optional)
-\end{Verbatim}
-
-PPP based protocols (\texttt{pppoe}, \texttt{pptp}, ...) accept these options:
-\begin{itemize}
-    \item{username} \\
-        The PPP username (usually with PAP authentication)
-    \item{password} \\
-        The PPP password
-    \item{keepalive} \\
-        Ping the PPP server (using LCP). The value of this option
-        specifies the maximum number of failed pings before reconnecting.
-        The ping interval defaults to 5, but can be changed by appending
-        ",<interval>" to the keepalive value
-    \item{demand} \\
-        Use Dial on Demand (value specifies the maximum idle time.
-    \item{server: (pptp)} \\
-        The remote pptp server IP
-\end{itemize}
-
-For all protocol types, you can also specify the MTU by using the \texttt{mtu} option.
-A sample PPPoE config would look like this:
-
-\begin{Verbatim}
-config interface     "lan"
-    option ifname    "eth0"
-    option proto     "pppoe"
-    option username  "username"
-    option password  "openwrt"
-    option mtu       "1492"      (optional)
-\end{Verbatim}
-
-\subsubsection{Setting up static routes}
-
-You can set up static routes for a specific interface that will be brought up 
-after the interface is configured.
-
-Simply add a config section like this:
-
-\begin{Verbatim}
-config route foo
-	option interface  "lan"
-	option target     "1.1.1.0"
-	option netmask    "255.255.255.0"
-	option gateway    "192.168.1.1"
-\end{Verbatim}
-
-The name for the route section is optional, the \texttt{interface}, \texttt{target} and 
-\texttt{gateway} options are mandatory.
-Leaving out the \texttt{netmask} option will turn the route into a host route.
-
-\subsubsection{Setting up the switch (broadcom only)}
-
-The switch configuration is set by adding a \texttt{'switch'} config section.
-Example:
-
-\begin{Verbatim}
-config switch       "eth0"
-    option vlan0    "1 2 3 4 5*"
-    option vlan1    "0 5"
-\end{Verbatim}
-
-On Broadcom hardware the section name needs to be eth0, as the switch driver
-does not detect the switch on any other physical device.
-Every vlan option needs to have the name vlan<n> where <n> is the VLAN number
-as used in the switch driver.
-As value it takes a list of ports with these optional suffixes:
-
-\begin{itemize}
-    \item{\texttt{'*'}:}
-        Set the default VLAN (PVID) of the Port to the current VLAN
-    \item{\texttt{'u'}:}
-        Force the port to be untagged
-    \item{\texttt{'t'}:}
-        Force the port to be tagged
-\end{itemize}
-
-The CPU port defaults to tagged, all other ports to untagged.
-On Broadcom hardware the CPU port is always 5. The other ports may vary with
-different hardware.
-
-For instance, if you wish to have 3 vlans, like one 3-port switch, 1 port in a
-DMZ, and another one as your WAN interface, use the following configuration :
-
-\begin{Verbatim}
-config switch       "eth0"
-    option vlan0    "1 2 3 5*"
-    option vlan1    "0 5"
-    option vlan2    "4 5"
-\end{Verbatim}
-
-Three interfaces will be automatically created using this switch layout :
-\texttt{eth0.0} (vlan0), \texttt{eth0.1} (vlan1) and \texttt{eth0.2} (vlan2).
-You can then assign those interfaces to a custom network configuration name
-like \texttt{lan}, \texttt{wan} or \texttt{dmz} for instance.
-
-\subsubsection{Setting up the switch (swconfig)}
-
-\emph{swconfig} based configurations have a different structure with one extra
-section per vlan. The example below shows a typical configuration:
-
-\begin{Verbatim}
-config 'switch' 'eth0'
-        option 'reset' '1'
-        option 'enable_vlan' '1'
-
-config 'switch_vlan' 'eth0_1'
-        option 'device' 'eth0'
-        option 'vlan' '1'
-        option 'ports' '0 1 2 3 5t'
-
-config 'switch_vlan' 'eth0_2'
-        option 'device' 'eth0'
-        option 'vlan' '2'
-        option 'ports' '4 5t'
-\end{Verbatim}
-
-\subsubsection{Setting up IPv6 connectivity}
-
-OpenWrt supports IPv6 connectivity using PPP, Tunnel brokers or static
-assignment.
-
-If you use PPP, IPv6 will be setup using IP6CP and there is nothing to
-configure.
-
-To setup an IPv6 tunnel to a tunnel broker, you can install the
-\texttt{6scripts} package and edit the \texttt{/etc/config/6tunnel}
-file and change the settings accordingly :
-
-\begin{Verbatim}
-config 6tunnel
-        option tnlifname     'sixbone'
-        option remoteip4     '1.0.0.1'
-        option localip4      '1.0.0.2'
-        option localip6      '2001::DEAD::BEEF::1'
-\end{Verbatim}
-
-\begin{itemize}
-    \item{\texttt{'tnlifname'}:}
-        Set the interface name of the IPv6 in IPv4 tunnel
-    \item{\texttt{'remoteip4'}:}
-        IP address of the remote end to establish the 6in4 tunnel.
-	This address is given by the tunnel broker
-    \item{\texttt{'localip4'}:}
-	IP address of your router to establish the 6in4 tunnel.
-	It will usually match your WAN IP address.
-    \item{\texttt{'localip6'}:}
-	IPv6 address to setup on your tunnel side
-	This address is given by the tunnel broker
-\end{itemize}
-
-Using the same package you can also setup an IPv6 bridged connection:
-
-\begin{Verbatim}
-config 6bridge
-	option bridge	'br6'
-\end{Verbatim}
-
-By default the script bridges the WAN interface with the LAN interface
-and uses ebtables to filter anything that is not IPv6 on the bridge.
-This configuration is particularly useful if your router is not
-IPv6 ND proxy capable (see: http://www.rfc-archive.org/getrfc.php?rfc=4389).
-
-IPv6 static addressing is also supported using a similar setup as
-IPv4 but with the \texttt{ip6} prefixing (when applicable).
-
-\begin{Verbatim}
-config interface     "lan"
-    option ifname    "eth0"
-    option proto     "static"
-    option ip6addr   "fe80::200:ff:fe00:0/64"
-    option ip6gw     "2001::DEAF:BEE:1"
-\end{Verbatim}
--- a/docs/openwrt.sty
+++ b/docs/openwrt.sty
@@ -1,10 +0,0 @@
-\ProvidesPackage{openwrt}
-
-\usepackage[latin9]{inputenc}
-\usepackage[bookmarks=true color=blue colorlinks=true]{hyperref}
-\usepackage[T1]{fontenc}
-\usepackage{ae,aecompl,aeguill}
-\usepackage{fancyvrb}
-\usepackage{enumerate}
-\setlength{\parindent}{0pt}
-\setlength{\parskip}\medskipamount
--- a/docs/openwrt.tex
+++ b/docs/openwrt.tex
@@ -1,41 +0,0 @@
-\documentclass[a4paper]{book}
-
-\usepackage{openwrt}
-
-\begin{document}
-\tableofcontents
-\chapter{The Router}
-  \section{Getting started}
-    \subsection{Installation}
-    \subsection{Initial configuration}
-    \subsection{Failsafe mode}
-  \section{Configuring OpenWrt}
-    \subsection{Network}
-      \input{network}
-    \subsection{Wireless}
-      \input{wireless}
-  \section{Advanced configuration}
-    \input{config}
-    \subsection{Hotplug}
-    \subsection{Init scripts}
-      \input{init-scripts}
-    \subsection{Network scripts}
-      \input{network-scripts}
-\chapter{Development issues}
-  \section{The build system}
-    \input{build}
-  \section{Extra tools}
-    \subsection{Image Builder}
-    \subsection{SDK}
-  \section{Working with OpenWrt}
-    \input{working}
-  \section{Adding platform support}
-     \input{adding}
-  \section{Debugging and debricking}
-     \input{debugging}
-   \section{Reporting bugs}
-	\subsection{Using the Trac ticket system}
-	\input{bugs}
-   \section{Submitting patches}
-    \input{submitting-patches}
-\end{document}
--- a/docs/submitting-patches.tex
+++ b/docs/submitting-patches.tex
@@ -1,53 +0,0 @@
-\subsection{How to contribute}
-OpenWrt is constantly being improved.  We'd like as many people to contribute
-to this as we can get. If you find a change useful, by all means try to get
-it incorporated into the project. This should improve OpenWrt and it should
-help carry your changes forward into future versions
-
-This section tries to lay out a procedure to enable people to submit patches
-in a way that is most effective for all concerned.
-
-It is important to do all these steps repeatedly:
-
-\begin{itemize}
-	\item \textit{listen} to what other people think.
-	\item \textit{talk} explaining what problem you are addressing and your
-		proposed solution.
-	\item \textit{do} write useful patches including documentation.
-    \item \textit{test. test. test.}
-\end{itemize}
-
-\subsection{Where to listen and talk}
-
-\begin{itemize}
-	\item google to find things related to your problem
-	\item Mailing lists: \href{http://lists.openwrt.org/}{http://lists.openwrt.org/}
-	\item Wiki: check the wiki: \href{http://wiki.openwrt.org/OpenWrtDocs}{http://wiki.openwrt.org/OpenWrtDocs}
-	\item Forum: \href{http://forum.openwrt.org/}{http://forum.openwrt.org/}
-	\item IRC: \texttt{irc.freenode.net}, channels \texttt{\#openwrt} and 
-		\texttt{\#openwrt-devel}
-	\item TRAC: \href{https://dev.openwrt.org/}{https://dev.openwrt.org/} the issue/bug/change tracking system
-\end{itemize}
-
-It is often best to document what you are doing before you do it.  The process
-of documentation often exposes possible improvements.  Keep your documentation
-up to date.
-
-\subsection{Patch Submission Process}
-\begin{enumerate}
-	\item Use git or svn to create a patch. Creating patches manually with 
-		\textit{diff -urN} also works, but is usually unnecessary.
-	\item Send a mail to openwrt-devel@lists.openwrt.org with the following contents:
-	\begin{enumerate}
-		\item \texttt{[PATCH] <short description>} in the Subject, followed by:
-		\item (optional) a longer description of your patch in the message body
-        \item \texttt{Signed-off-by: Your name <your@email.address>}
-		\item Your actual patch, inline, not word wrapped or whitespace mangled. 
-	\end{enumerate}
-	\item Please read \href{http://kerneltrap.org/Linux/Email\_Clients\_and\_Patches}{http://kerneltrap.org/Linux/Email\_Clients\_and\_Patches}
-		to find out how to make sure your email client doesn't destroy your patch.
-	\item Please use your real name and email address in the \texttt{Signed-off-by}
-		line, following the same guidelines as in the \href{http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/SubmittingPatches;h=681e2b36195c98ea5271b76383b3a574b190b04f;hb=HEAD}{Linux Kernel patch submission guidelines}
-	\item Example of a properly formatted patch submission: \\
-	\href{http://lists.openwrt.org/pipermail/openwrt-devel/2007-November/001334.html}{http://lists.openwrt.org/pipermail/openwrt-devel/2007-November/001334.html}
-\end{enumerate}
--- a/docs/wireless.tex
+++ b/docs/wireless.tex
@@ -1,492 +0,0 @@
-The WiFi settings are configured in the file \texttt{/etc/config/wireless}
-(currently supported on Broadcom, Atheros and mac80211). When booting the router for the first time
-it should detect your card and create a sample configuration file. By default '\texttt{option network  lan}' is
-commented. This prevents unsecured sharing of the network over the wireless interface.
-
-Each wireless driver has its own configuration script in \texttt{/lib/wifi/driver\_name.sh} which handles
-driver specific options and configurations. This script is also calling driver specific binaries like wlc for
-Broadcom, or hostapd and wpa\_supplicant for atheros and mac80211.
-
-The reason for using such architecture, is that it abstracts the driver configuration. 
-
-\paragraph{Generic Broadcom wireless config:}
-
-\begin{Verbatim}
-config wifi-device      "wl0"
-    option type         "broadcom"
-    option channel      "5"
-
-config wifi-iface
-    option device       "wl0"
-#   option network  lan
-    option mode         "ap"
-    option ssid         "OpenWrt"
-    option hidden       "0"
-    option encryption   "none"
-\end{Verbatim}
-
-\paragraph{Generic Atheros wireless config:}
-
-\begin{Verbatim}
-config wifi-device      "wifi0"
-    option type         "atheros"
-    option channel      "5"
-    option hwmode	"11g"
-
-config wifi-iface
-    option device       "wifi0"
-#   option network  lan
-    option mode         "ap"
-    option ssid         "OpenWrt"
-    option hidden       "0"
-    option encryption   "none"
-\end{Verbatim}
-
-\paragraph{Generic mac80211 wireless config:}
-
-\begin{Verbatim}
-config wifi-device      "wifi0"
-    option type         "mac80211"
-    option channel      "5"
-
-config wifi-iface
-    option device       "wlan0"
-#   option network  lan
-    option mode         "ap"
-    option ssid         "OpenWrt"
-    option hidden       "0"
-    option encryption   "none"
-\end{Verbatim}
-
-\paragraph{Generic multi-radio Atheros wireless config:}
-
-\begin{Verbatim}
-config wifi-device  wifi0
-    option type     atheros
-    option channel  1
-
-config wifi-iface
-    option device   wifi0
-#   option network  lan
-    option mode     ap
-    option ssid     OpenWrt_private
-    option hidden   0
-    option encryption none
-
-config wifi-device  wifi1
-    option type     atheros
-    option channel  11
-
-config wifi-iface
-    option device   wifi1
-#   option network  lan
-    option mode     ap
-    option ssid     OpenWrt_public
-    option hidden   1
-    option encryption none
-\end{Verbatim}
-
-There are two types of config sections in this file. The '\texttt{wifi-device}' refers to
-the physical wifi interface and '\texttt{wifi-iface}' configures a virtual interface on top
-of that (if supported by the driver).
-
-A full outline of the wireless configuration file with description of each field:
-
-\begin{Verbatim}
-config wifi-device    wifi device name
-    option type       broadcom, atheros, mac80211
-    option country    us, uk, fr, de, etc.
-    option channel    1-14
-    option maxassoc   1-128 (broadcom only)
-    option distance   1-n (meters)
-    option hwmode     11b, 11g, 11a, 11bg (atheros, mac80211)
-    option rxantenna  0,1,2 (atheros, broadcom)
-    option txantenna  0,1,2 (atheros, broadcom)
-    option txpower  transmission power in dBm
-
-config wifi-iface
-    option network  the interface you want wifi to bridge with
-    option device   wifi0, wifi1, wifi2, wifiN
-    option mode     ap, sta, adhoc, monitor, mesh, or wds
-    option txpower  (deprecated) transmission power in dBm
-    option ssid     ssid name
-    option bssid    bssid address
-    option encryption none, wep, psk, psk2, wpa, wpa2
-    option key      encryption key
-    option key1     key 1
-    option key2     key 2
-    option key3     key 3
-    option key4     key 4
-    option passphrase 0,1
-    option server   ip address
-    option port     port
-    option hidden   0,1
-    option isolate  0,1	(broadcom)
-    option doth     0,1	(atheros, broadcom)
-    option wmm      0,1	(atheros, broadcom)
-\end{Verbatim}
-
-\paragraph{Options for the \texttt{wifi-device}:}
-
-\begin{itemize}
-    \item \texttt{type} \\
-        The driver to use for this interface.
-	
-    \item \texttt{country} \\
-        The country code used to determine the regulatory settings.
-
-    \item \texttt{channel} \\
-        The wifi channel (e.g. 1-14, depending on your country setting).
-
-    \item \texttt{maxassoc} \\
-        Optional: Maximum number of associated clients. This feature is supported only on the Broadcom chipsets.
-
-    \item \texttt{distance} \\
-	Optional: Distance between the ap and the furthest client in meters. This feature is supported only on the Atheros chipsets.
-
-	\item \texttt{mode} \\
-		The frequency band (\texttt{b}, \texttt{g}, \texttt{bg}, \texttt{a}). This feature is only supported on the Atheros chipsets.
-
-    \item \texttt{diversity} \\
-	Optional: Enable diversity for the Wi-Fi device. This feature is supported only on the Atheros chipsets.
-
-    \item \texttt{rxantenna} \\
-	Optional: Antenna identifier (0, 1 or 2) for reception. This feature is supported by Atheros and some Broadcom chipsets.
-
-    \item \texttt{txantenna} \\
-	Optional: Antenna identifier (0, 1 or 2) for emission. This feature is supported by Atheros and some Broadcom chipsets.
-
-    \item \texttt{txpower}
-	Set the transmission power to be used. The amount is specified in dBm.
-
-\end{itemize}
-
-\paragraph{Options for the \texttt{wifi-iface}:}
-
-\begin{itemize}
-    \item \texttt{network} \\
-        Selects the interface section from \texttt{/etc/config/network} to be
-        used with this interface
-
-    \item \texttt{device} \\
-	Set the wifi device name.
-
-    \item \texttt{mode} \\
-        Operating mode:
-
-        \begin{itemize}
-            \item \texttt{ap} \\
-                Access point mode
-
-            \item \texttt{sta} \\
-                Client mode
-
-            \item \texttt{adhoc} \\
-                Ad-Hoc mode
-
-            \item \texttt{monitor} \\
-                Monitor mode
-
-	    \item \texttt{mesh} \\
-		Mesh Point mode (802.11s)
-
-            \item \texttt{wds} \\
-                WDS point-to-point link
-
-        \end{itemize}
-
-    \item \texttt{ssid}
-	Set the SSID to be used on the wifi device.
-
-    \item \texttt{bssid}
-	Set the BSSID address to be used for wds to set the mac address of the other wds unit.
-
-    \item \texttt{txpower}
-	(Deprecated, set in wifi-device) Set the transmission power to be used. The amount is specified in dBm.
-
-    \item \texttt{encryption} \\
-        Encryption setting. Accepts the following values:
-
-        \begin{itemize}
-	    \item \texttt{none}
-	    \item \texttt{wep}
-            \item \texttt{psk}, \texttt{psk2} \\
-                WPA(2) Pre-shared Key
-
-            \item \texttt{wpa}, \texttt{wpa2} \\
-                WPA(2) RADIUS
-        \end{itemize}
-
-    \item \texttt{key, key1, key2, key3, key4} (wep, wpa and psk) \\
-        WEP key, WPA key (PSK mode) or the RADIUS shared secret (WPA RADIUS mode)
-
-    \item \texttt{passphrase} (wpa) \\
-        0 treats the wpa psk as a text passphrase; 1 treats wpa psk as
-        encoded passphrase. You can generate an encoded passphrase with
-        the wpa\_passphrase utility. This is especially useful if your
-        passphrase contains special characters. This option only works
-        when using mac80211 or atheros type devices.
-
-    \item \texttt{server} (wpa) \\
-        The RADIUS server ip address
-
-    \item \texttt{port} (wpa) \\
-        The RADIUS server port (defaults to 1812)
-
-    \item \texttt{hidden} \\
-        0 broadcasts the ssid; 1 disables broadcasting of the ssid
-
-    \item \texttt{isolate} \\
-        Optional: Isolation is a mode usually set on hotspots that limits the clients to communicate only with the AP and not with other wireless clients.
-        0 disables ap isolation (default); 1 enables ap isolation.
-
-    \item \texttt{doth} \\
-        Optional: Toggle 802.11h mode.
-        0 disables 802.11h (default); 1 enables it.
-
-    \item \texttt{wmm} \\
-        Optional: Toggle 802.11e mode.
-        0 disables 802.11e (default); 1 enables it.
-
-\end{itemize}
-
-\paragraph{Mesh Point}
-
-Mesh Point (802.11s) is only supported by some mac80211 drivers. It requires the iw package
-to be installed to setup mesh links. OpenWrt creates mshN mesh point interfaces. A sample
-configuration looks like this:
-
-\begin{Verbatim}
-config wifi-device      "wlan0"
-    option type		"mac80211"
-    option channel      "5"
-
-config wifi-iface
-    option device       "wlan0"
-    option network  	lan
-    option mode         "mesh"
-    option mesh_id     "OpenWrt"
-\end{Verbatim}
-
-\paragraph{Wireless Distribution System}
-
-WDS is a non-standard mode which will be working between two Broadcom devices for instance
-but not between a Broadcom and Atheros device.
-
-\subparagraph{Unencrypted WDS connections}
-
-This configuration example shows you how to setup unencrypted WDS connections.
-We assume that the peer configured as below as the BSSID ca:fe:ba:be:00:01
-and the remote WDS endpoint ca:fe:ba:be:00:02 (option bssid field).
-
-\begin{Verbatim}
-config wifi-device      "wl0"
-    option type		"broadcom"
-    option channel      "5"
-
-config wifi-iface
-    option device       "wl0"
-    option network  	lan
-    option mode         "ap"
-    option ssid         "OpenWrt"
-    option hidden       "0"
-    option encryption   "none"
-
-config wifi-iface
-    option device       "wl0"
-    option network      lan
-    option mode         wds
-    option ssid         "OpenWrt WDS"
-    option bssid        "ca:fe:ba:be:00:02"
-\end{Verbatim}
-
-\subparagraph{Encrypted WDS connections}
-
-It is also possible to encrypt WDS connections. \texttt{psk}, \texttt{psk2} and
-\texttt{psk+psk2} modes are supported. Configuration below is an example
-configuration using Pre-Shared-Keys with AES algorithm.
-
-\begin{Verbatim}
-config wifi-device  wl0
-    option type     broadcom
-    option channel  5
-
-config wifi-iface
-    option device   "wl0"
-    option network  lan
-    option mode     ap
-    option ssid     "OpenWrt"
-    option encryption  psk2
-    option key      "<key for clients>"
-
-config wifi-iface
-    option device   "wl0"
-    option network  lan
-    option mode     wds
-    option bssid    ca:fe:ba:be:00:02
-    option ssid     "OpenWrt WDS"
-    option encryption	psk2
-    option key      "<psk for WDS>"
-\end{Verbatim}
-
-\paragraph{802.1x configurations}
-
-OpenWrt supports both 802.1x client and Access Point
-configurations. 802.1x client is only working with
-drivers supported by wpa-supplicant. Configuration
-only supports EAP types TLS, TTLS or PEAP.
-
-\subparagraph{EAP-TLS}
-
-\begin{Verbatim}
-config wifi-iface
-    option device         "ath0"
-    option network        lan
-    option ssid           OpenWrt
-    option eap_type       tls
-    option ca_cert        "/etc/config/certs/ca.crt"
-    option priv_key       "/etc/config/certs/priv.crt"
-    option priv_key_pwd   "PKCS#12 passphrase"
-\end{Verbatim}
-
-\subparagraph{EAP-PEAP}
-
-\begin{Verbatim}
-config wifi-iface
-    option device         "ath0"
-    option network        lan
-    option ssid           OpenWrt
-    option eap_type       peap
-    option ca_cert        "/etc/config/certs/ca.crt"
-    option auth           MSCHAPV2
-    option identity       username
-    option password       password
-\end{Verbatim}
-
-\paragraph{Limitations:}
-
-There are certain limitations when combining modes.
-Only the following mode combinations are supported:
-
-\begin{itemize}
-    \item \textbf{Broadcom}: \\
-        \begin{itemize}
-            \item 1x \texttt{sta}, 0-3x \texttt{ap}
-            \item 1-4x \texttt{ap}
-            \item 1x \texttt{adhoc}
-            \item 1x \texttt{monitor}
-        \end{itemize}
-
-        WDS links can only be used in pure AP mode and cannot use WEP (except when sharing the
-        settings with the master interface, which is done automatically).
-
-    \item \textbf{Atheros}: \\
-        \begin{itemize}
-            \item 1x \texttt{sta}, 0-Nx \texttt{ap}
-            \item 1-Nx \texttt{ap}
-            \item 1x \texttt{adhoc}
-        \end{itemize}
-
-	N is the maximum number of VAPs that the module allows, it defaults to 4, but can be
-	changed by loading the module with the maxvaps=N parameter.
-\end{itemize}
-
-\paragraph{Adding a new driver configuration}
-
-Since we currently only support thread different wireless drivers : Broadcom, Atheros and mac80211,
-you might be interested in adding support for another driver like Ralink RT2x00, 
-Texas Instruments ACX100/111.
-
-The driver specific script should be placed in \texttt{/lib/wifi/<driver>.sh} and has to
-include several functions providing :
-
-\begin{itemize}
-	\item detection of the driver presence
-	\item enabling/disabling the wifi interface(s)
-	\item configuration reading and setting
-	\item third-party programs calling (nas, supplicant)
-\end{itemize}
-
-Each driver script should append the driver to a global DRIVERS variable :
-
-\begin{Verbatim}
-append DRIVERS "driver name"
-\end{Verbatim}
-
-\subparagraph{\texttt{scan\_<driver>}}
-
-This function will parse the \texttt{/etc/config/wireless} and make sure there
-are no configuration incompatibilities, like enabling hidden SSIDS with ad-hoc mode
-for instance. This can be more complex if your driver supports a lof of configuration
-options. It does not change the state of the interface.
-
-Example:
-\begin{Verbatim}
-scan_dummy() {
-	local device="$1"
-
-	config_get vifs "$device" vifs
-	for vif in $vifs; do
-		# check config consistency for wifi-iface sections
-	done
-	# check mode combination
-}
-\end{Verbatim}
-
-\subparagraph{\texttt{enable\_<driver>}}
-
-This function will bring up the wifi device and optionally create application specific
-configuration files, e.g. for the WPA authenticator or supplicant.
-
-Example:
-\begin{Verbatim}
-enable_dummy() {
-	local device="$1"
-
-	config_get vifs "$device" vifs
-	for vif in $vifs; do
-		# bring up virtual interface belonging to
-		# the wifi-device "$device"
-	done
-}
-\end{Verbatim}
-
-\subparagraph{\texttt{disable\_<driver>}}
-
-This function will bring down the wifi device and all its virtual interfaces (if supported).
-
-Example:
-\begin{Verbatim}
-disable_dummy() {
-	local device="$1"
-
-	# bring down virtual interfaces belonging to
-	# "$device" regardless of whether they are
-	# configured or not. Don't rely on the vifs
-	# variable at this point
-}
-\end{Verbatim}
-
-\subparagraph{\texttt{detect\_<driver>}}
-
-This function looks for interfaces that are usable with the driver. Template config sections
-for new devices should be written to stdout. Must check for already existing config sections
-belonging to the interfaces before creating new templates.
-
-Example:
-\begin{Verbatim}
-detect_dummy() {
-	[ wifi-device = "$(config_get dummydev type)" ] && return 0
-	cat <<EOF
-config wifi-device dummydev
-	option type dummy
-	# REMOVE THIS LINE TO ENABLE WIFI:
-	option disabled 1
-
-config wifi-iface
-	option device dummydev
-	option mode ap
-	option ssid OpenWrt
-EOF
-}
-\end{Verbatim}
--- a/docs/working.tex
+++ b/docs/working.tex
@@ -1,112 +0,0 @@
-The following section gives some tips and tricks on how to use efficiently
-OpenWrt on a regular basis and for daily work.
-
-\subsection{Compiling/recompiling components}
-
-The buildroot allows you to recompile the full environment or only parts of it
-like the toolchain, the kernel modules, the kernel or some packages.
-
-For instance if you want to recompile the toolchain after you made any change to it
-issue the following command:
-
-\begin{Verbatim}
-make toolchain/{clean,compile,install}
-\end{Verbatim}
-
-Which will clean, compile and install the toolchain. The command actually expands to the
-following:
-
-\begin{Verbatim}
-make[1] toolchain/clean
-make[2] -C toolchain/kernel-headers clean
-make[2] -C toolchain/binutils clean
-make[2] -C toolchain/gcc clean
-make[2] -C toolchain/uClibc clean	(glibc or eglibc when chosen)
-\end{Verbatim}
-
-Of course, you could only choose to recompile one or several of the toolchain components
-(binutils, kernel-headers gcc, C library) individually.
-
-The exact same idea works for packages:
-
-\begin{Verbatim}
-make package/busybox/{clean,compile,install}
-\end{Verbatim}
-
-will clean, compile and install busybox (if selected to be installed on the final rootfs).
-
-Supposing that you made changes to the Linux kernel, but do not want to recompile everything,
-you can recompile only the kernel modules by issuing:
-
-\begin{Verbatim}
-make target/linux/compile
-\end{Verbatim}
-
-To recompile the static part of the kernel use the following command:
-
-\begin{Verbatim}
-make target/linux/install
-\end{Verbatim}
-
-\subsection{Using quilt inside OpenWrt}
-
-OpenWrt integrates quilt in order to ease the package, kernel and toolchain
-patches maintenance when migrating over new versions of the software.
-
-Quilt intends to replace an old workflow, where you would download the new
-source file, create an original copy of it, an a working copy, then try to
-apply by hand old patches and resolve conflicts manually. Additionnaly, using
-quilt allows you to update and fold patches into other patches easily.
-
-Quilt is used by default to apply Linux kernel patches, but not for the other
-components (toolchain and packages).
-
-\subsubsection{Using quilt with kernel patches}
-
-Assuming that you have everything setup for your new kernel version:
-\begin{itemize}
-\item \texttt{LINUX\_VERSION} set in the target Makefile
-\item config-2.6.x.y existing
-\item patches-2.6.x.y containing the previous patches
-\end{itemize}
-
-Some patches are likely to fail since the vanilla kernel we are patching
-received modifications so some hunks of the patches are no longer applying.
-We will use quilt to get them applying cleanly again. Follow this procedure
-whenever you want to upgrade the kernel using previous patches:
-
-\begin{enumerate}
-\item make target/linux/clean (removes the old version)
-\item make target/linux/compile (uncompress the kernel and try to apply patches)
-\item if patches failed to apply:
-\item cd build\_dir/linux-target/linux-2.6.x.y
-\item quilt push -a (to apply patches where quilt stopped)
-\item quilt push -f (to force applying patches)
-\item edit .rej files, apply the necessary changes to the files
-\item remove .rej files
-\item quilt refresh
-\item repeat operation 3 and following until all patches have been applied
-\item when all patches did apply cleanly: make target/linux/refresh
-\end{enumerate}
-
-Note that generic (target/linux/generic-2.6/linux-2.6.x/) patches can be found in 
-\texttt{build\_dir/linux-target/linux-2.6.x.y/patches/generic} and platform specific
-patches in \texttt{build\_dir/linux-target/linux-2.6.x.y/patches/platform}.
-
-\subsubsection{Using quilt with packages}
-
-As we mentionned earlier, quilt is enabled by default for kernel patches, but not for
-packages. If you want to use quilt in the same way, you should set the QUILT environment
-variable to 1, e.g:
-
-\begin{Verbatim}
-make package/busybox/{clean,compile} QUILT=1
-\end{Verbatim}
-
-Will generate the patch series file and allow you to update patches just like we described
-before in the kernel case. Note that once all patches apply cleanly you should refresh them
-as well using the following command:
-
-\begin{Verbatim}
-make package/busybox/refresh QUILT=1
-\end{Verbatim}
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,8 +1,4 @@
-src-git packages https://github.com/openwrt/packages.git
-src-git luci https://github.com/openwrt/luci.git
-src-git routing https://github.com/openwrt-routing/packages.git
-src-git telephony https://github.com/openwrt/telephony.git
-src-git management https://github.com/openwrt-management/packages.git
-src-git targets https://github.com/openwrt/targets.git
-#src-git oldpackages http://git.openwrt.org/packages.git
-#src-link custom /usr/src/openwrt/custom-feed
+src-git packages https://git.lede-project.org/feed/packages.git^21b2e3eb761ea79bf3a8d2b6368435887960f5c2
+src-git luci https://git.lede-project.org/project/luci.git^079f65a628a4c4179578c043d2905efea93bb167
+src-git routing https://git.lede-project.org/feed/routing.git^d11075cd40a88602bf4ba2b275f72100ddcb4767
+src-git telephony https://git.lede-project.org/feed/telephony.git^ac6415e61f147a6892fd2785337aec93ddc68fa9
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -85,11 +85,11 @@ endef

 define gettext_version_target
 	(cd $(PKG_BUILD_DIR) && \
-		GETTEXT_VERSION=$(shell $(STAGING_DIR)/host/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.* //p') && \
+		GETTEXT_VERSION=$(shell $(STAGING_DIR_HOSTPKG)/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.*\([0-9]\.[0-9]\{2\}\.[0-9]\).*/\1/p' ) && \
 		$(STAGING_DIR_HOST)/bin/sed \
 			-i $(PKG_BUILD_DIR)/configure.ac \
 			-e "s/AM_GNU_GETTEXT_VERSION(.*)/AM_GNU_GETTEXT_VERSION(\[$$$$GETTEXT_VERSION\])/g" && \
-		$(STAGING_DIR)/host/bin/autopoint --force \
+		$(STAGING_DIR_HOSTPKG)/bin/autopoint --force \
 	);
 endef

--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -6,7 +6,10 @@ ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
  MAKE_FLAGS+=VERBOSE=1
 endif

-CMAKE_SOURCE_DIR:=.
+CMAKE_BINARY_DIR = $(PKG_BUILD_DIR)$(if $(CMAKE_BINARY_SUBDIR),/$(CMAKE_BINARY_SUBDIR))
+CMAKE_SOURCE_DIR = $(PKG_BUILD_DIR)
+HOST_CMAKE_SOURCE_DIR = $(HOST_BUILD_DIR)
+MAKE_PATH = $(firstword $(CMAKE_BINARY_SUBDIR) .)

 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
  cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1)
@@ -35,9 +38,10 @@ CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOST)
 CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions

 define Build/Configure/Default
-	(cd $(PKG_BUILD_DIR); \
+	mkdir -p $(CMAKE_BINARY_DIR)
+	(cd $(CMAKE_BINARY_DIR); \
 		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
 		cmake \
 			-DCMAKE_SYSTEM_NAME=Linux \
@@ -100,6 +104,10 @@ define Host/Configure/Default
 			-DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \
 			-DCMAKE_SKIP_RPATH=TRUE  \
 			$(CMAKE_HOST_OPTIONS) \
-		$(CMAKE_SOURCE_DIR) \
+		$(HOST_CMAKE_SOURCE_DIR) \
 	)
 endef
+
+MAKE_FLAGS += \
+	CMAKE_COMMAND='$$(if $$(CMAKE_DISABLE_$$@),:,$(STAGING_DIR_HOST)/bin/cmake)' \
+	CMAKE_DISABLE_cmake_check_build_system=1
--- a/include/depends.mk
+++ b/include/depends.mk
@@ -13,7 +13,7 @@

 DEP_FINDPARAMS := -x "*/.svn*" -x ".*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check" -x "*/.*.swp"

-find_md5=$(SH_FUNC) find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
+find_md5=find $(wildcard $(1)) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | mkhash md5

 define rdep
  .PRECIOUS: $(2)
--- a/include/download.mk
+++ b/include/download.mk
@@ -1,11 +1,19 @@
 #
 # Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2016 LEDE project
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

 OPENWRT_GIT = http://git.openwrt.org
+LEDE_GIT = https://git.lede-project.org
+
+ifdef PKG_SOURCE_VERSION
+PKG_VERSION ?= $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION))
+PKG_SOURCE_SUBDIR ?= $(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE ?= $(PKG_SOURCE_SUBDIR).tar.xz
+endif

 DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)

@@ -31,28 +39,91 @@ $(strip \
 endef

 # code for creating tarballs from cvs/svn/git/bzr/hg/darcs checkouts - useful for mirror support
-dl_pack/bz2=$(TAR) cjf $(1) $(2)
-dl_pack/gz=$(TAR) czf $(1) $(2)
-dl_pack/xz=$(TAR) c $(2) | xz -zc > $(1)
-dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false
+dl_pack/bz2=bzip2 -c > $(1)
+dl_pack/gz=gzip -nc > $(1)
+dl_pack/xz=xz -zc -7e > $(1)
+dl_pack/unknown=$(error ERROR: Unknown pack format for file $(1))
 define dl_pack
 	$(if $(dl_pack/$(call ext,$(1))),$(dl_pack/$(call ext,$(1))),$(dl_pack/unknown))
 endef
+define dl_tar_pack
+	$(TAR) --numeric-owner --owner=0 --group=0 --sort=name $$$${TAR_TIMESTAMP:+--mtime="$$$$TAR_TIMESTAMP"} -c $(2) | $(call dl_pack,$(1))
+endef
+
+ifdef CHECK
+check_escape=$(subst ','\'',$(1))
+#')
+
+check_warn_nofix = $(info $(shell printf "$(_R)WARNING: %s$(_N)" '$(call check_escape,$(call C_$(1),$(2),$(3),$(4)))'))
+ifndef FIXUP
+  check_warn = $(check_warn_nofix)
+else
+  check_warn = $(if $(filter-out undefined,$(origin F_$(1))),$(filter ,$(shell $(call F_$(1),$(2),$(3),$(4)) >&2)),$(check_warn_nofix))
+endif
+
+gen_sha256sum = $(shell mkhash sha256 $(DL_DIR)/$(1))
+
+ifdef FIXUP
+F_hash_deprecated = $(SCRIPT_DIR)/fixup-makefile.pl $(CURDIR)/Makefile fix-hash $(3) $(call gen_sha256sum,$(1)) $(2)
+F_hash_mismatch = $(F_hash_deprecated)
+F_hash_missing = $(SCRIPT_DIR)/fixup-makefile.pl $(CURDIR)/Makefile add-hash $(3) $(call gen_sha256sum,$(1))
+endif
+
+C_download_missing = $(1) is missing, please run make download before re-running this check
+C_hash_mismatch = $(3) does not match $(1) hash $(call gen_sha256sum,$(1))
+C_hash_deprecated = $(3) uses deprecated hash, set to $(call gen_sha256sum,$(1))
+C_hash_missing = $(3) is missing, set to $(call gen_sha256sum,$(1))
+
+check_hash = \
+  $(if $(wildcard $(DL_DIR)/$(1)), \
+    $(if $(filter-out x,$(2)), \
+      $(if $(filter 64,$(shell printf '%s' '$(2)' | wc -c)), \
+        $(if $(filter $(2),$(call gen_sha256sum,$(1))),, \
+          $(call check_warn,hash_mismatch,$(1),$(2),$(3)) \
+        ), \
+        $(call check_warn,hash_deprecated,$(1),$(2),$(3)), \
+      ), \
+      $(call check_warn,hash_missing,$(1),$(2),$(3)) \
+    ), \
+    $(call check_warn,download_missing,$(1),$(2),$(3)) \
+  )
+
+ifdef FIXUP
+F_md5_deprecated = $(SCRIPT_DIR)/fixup-makefile.pl $(CURDIR)/Makefile rename-var $(2) $(3)
+endif
+
+C_md5_deprecated = Use of $(2) is deprecated, switch to $(3)
+
+check_md5 = \
+  $(if $(filter-out x,$(1)), \
+    $(call check_warn,md5_deprecated,$(1),$(2),$(3)) \
+  )
+
+hash_var = $(if $(filter-out x,$(1)),MD5SUM,HASH)
+endif

 define DownloadMethod/unknown
 	@echo "ERROR: No download method available"; false
 endef

 define DownloadMethod/default
-	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MD5SUM)" "$(URL_FILE)" $(foreach url,$(URL),"$(url)")
+	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(HASH)" "$(URL_FILE)" $(foreach url,$(URL),"$(url)") \
+	$(if $(filter check,$(1)), \
+		$(call check_hash,$(FILE),$(HASH),$(2)$(call hash_var,$(MD5SUM))) \
+		$(call check_md5,$(MD5SUM),$(2)MD5SUM,$(2)HASH) \
+	)
 endef

 define wrap_mirror
-$(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" "" || ( $(1) ),$(1))
+$(if $(if $(MIRROR),$(filter-out x,$(MIRROR_HASH))),$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_HASH)" "" || ( $(3) ),$(3)) \
+$(if $(filter check,$(1)), \
+	$(call check_hash,$(FILE),$(MIRROR_HASH),$(2)MIRROR_$(call hash_var,$(MIRROR_MD5SUM))) \
+	$(call check_md5,$(MIRROR_MD5SUM),$(2)MIRROR_MD5SUM,$(2)MIRROR_HASH) \
+)
 endef

 define DownloadMethod/cvs
-	$(call wrap_mirror, \
+	$(call wrap_mirror,$(1),$(2), \
 		echo "Checking out files from the cvs repository..."; \
 		mkdir -p $(TMP_DIR)/dl && \
 		cd $(TMP_DIR)/dl && \
@@ -60,14 +131,14 @@ define DownloadMethod/cvs
 		[ \! -d $(SUBDIR) ] && \
 		cvs -d $(URL) export $(VERSION) $(SUBDIR) && \
 		echo "Packing checkout..." && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
 		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
 		rm -rf $(SUBDIR); \
 	)
 endef

 define DownloadMethod/svn
-	$(call wrap_mirror, \
+	$(call wrap_mirror,$(1),$(2), \
 		echo "Checking out files from the svn repository..."; \
 		mkdir -p $(TMP_DIR)/dl && \
 		cd $(TMP_DIR)/dl && \
@@ -77,72 +148,77 @@ define DownloadMethod/svn
 		svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) || \
 		svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \
 		echo "Packing checkout..." && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		export TAR_TIMESTAMP="" && \
+		$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
 		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
 		rm -rf $(SUBDIR); \
 	)
 endef

 define DownloadMethod/git
-	$(call wrap_mirror, \
+	$(call wrap_mirror,$(1),$(2), \
 		echo "Checking out files from the git repository..."; \
 		mkdir -p $(TMP_DIR)/dl && \
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
-		git clone $(URL) $(SUBDIR) && \
+		git clone $(OPTS) $(URL) $(SUBDIR) && \
 		(cd $(SUBDIR) && git checkout $(VERSION) && \
 		git submodule update --init --recursive) && \
 		echo "Packing checkout..." && \
+		export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --format='@%ct'` && \
 		rm -rf $(SUBDIR)/.git && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
 		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
 		rm -rf $(SUBDIR); \
 	)
 endef

 define DownloadMethod/bzr
-	$(call wrap_mirror, \
+	$(call wrap_mirror,$(1),$(2), \
 		echo "Checking out files from the bzr repository..."; \
 		mkdir -p $(TMP_DIR)/dl && \
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
-		bzr export -r$(VERSION) $(SUBDIR) $(URL) && \
+		bzr export --per-file-timestamps -r$(VERSION) $(SUBDIR) $(URL) && \
 		echo "Packing checkout..." && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		export TAR_TIMESTAMP="" && \
+		$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
 		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
 		rm -rf $(SUBDIR); \
 	)
 endef

 define DownloadMethod/hg
-	$(call wrap_mirror, \
+	$(call wrap_mirror,$(1),$(2), \
 		echo "Checking out files from the hg repository..."; \
 		mkdir -p $(TMP_DIR)/dl && \
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
 		hg clone -r $(VERSION) $(URL) $(SUBDIR) && \
+		export TAR_TIMESTAMP=`cd $(SUBDIR) && hg log --template '@{date}' -l 1` && \
 		find $(SUBDIR) -name .hg | xargs rm -rf && \
 		echo "Packing checkout..." && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
 		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
 		rm -rf $(SUBDIR); \
 	)
 endef

 define DownloadMethod/darcs
-	$(call wrap_mirror, \
+	$(call wrap_mirror, $(1), $(2), \
 		echo "Checking out files from the darcs repository..."; \
 		mkdir -p $(TMP_DIR)/dl && \
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
 		darcs get -t $(VERSION) $(URL) $(SUBDIR) && \
+		export TAR_TIMESTAMP=`cd $(SUBDIR) && LC_ALL=C darcs log --last 1 | sed -ne 's!^Date: \+!!p'` && \
 		find $(SUBDIR) -name _darcs | xargs rm -rf && \
 		echo "Packing checkout..." && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
 		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
 		rm -rf $(SUBDIR); \
 	)
@@ -160,11 +236,27 @@ define Download/Defaults
  FILE:=
  URL_FILE:=
  PROTO:=
-  MD5SUM:=
+  HASH=$$(MD5SUM)
+  MD5SUM:=x
  SUBDIR:=
  MIRROR:=1
+  MIRROR_HASH=$$(MIRROR_MD5SUM)
  MIRROR_MD5SUM:=x
  VERSION:=
+  OPTS:=
+endef
+
+define Download/default
+  FILE:=$(PKG_SOURCE)
+  URL:=$(PKG_SOURCE_URL)
+  SUBDIR:=$(PKG_SOURCE_SUBDIR)
+  PROTO:=$(PKG_SOURCE_PROTO)
+  $(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
+  $(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM))
+  $(if $(PKG_MIRROR_HASH),MIRROR_HASH:=$(PKG_MIRROR_HASH))
+  VERSION:=$(PKG_SOURCE_VERSION)
+  $(if $(PKG_MD5SUM),MD5SUM:=$(PKG_MD5SUM))
+  $(if $(PKG_HASH),HASH:=$(PKG_HASH))
 endef

 define Download
@@ -183,6 +275,11 @@ define Download

  $(DL_DIR)/$(FILE):
 	mkdir -p $(DL_DIR)
-	$(call locked,$(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown)),$(FILE))
+	$(call locked, \
+		$(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))), \
+			$(call DownloadMethod/$(call dl_method,$(URL),$(PROTO)),check,$(if $(filter default,$(1)),PKG_,Download/$(1):)), \
+			$(DownloadMethod/unknown) \
+		),\
+		$(FILE))

 endef
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2016 LEDE Project
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,11 +8,27 @@

 -include $(TMP_DIR)/.packagesubdirs

-FEEDS_AVAILABLE:=$(shell $(SCRIPT_DIR)/feeds list -n)
 FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*))
-FEEDS_ENABLED:=$(foreach feed,$(FEEDS_INSTALLED),$(if $(CONFIG_FEED_$(feed)),$(feed)))
+FEEDS_AVAILABLE:=$(sort $(FEEDS_INSTALLED) $(shell $(SCRIPT_DIR)/feeds list -n))
+FEEDS_ENABLED:=$(foreach feed,$(FEEDS_AVAILABLE),$(if $(CONFIG_FEED_$(feed)),$(feed)))
 FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE))

+PACKAGE_SUBDIRS=$(PACKAGE_DIR)
+ifneq ($(CONFIG_PER_FEED_REPO),)
+  PACKAGE_SUBDIRS += $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/base
+  ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),)
+    PACKAGE_SUBDIRS += $(foreach FEED,$(FEEDS_AVAILABLE),$(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(FEED))
+  else
+    PACKAGE_SUBDIRS += $(foreach FEED,$(FEEDS_ENABLED),$(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(FEED))
+  endif
+endif
+
+PACKAGE_DIR_ALL := $(TOPDIR)/staging_dir/packages/$(BOARD)
+
+opkg_package_files = $(wildcard \
+	$(foreach dir,$(PACKAGE_SUBDIRS), \
+	  $(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk)))
+
 PKG_CONFIG_DEPENDS += \
 	CONFIG_PER_FEED_REPO \
 	CONFIG_PER_FEED_REPO_ADD_DISABLED \
@@ -21,19 +38,19 @@ PKG_CONFIG_DEPENDS += \
 # 1: package name
 define FeedPackageDir
 $(strip $(if $(CONFIG_PER_FEED_REPO), \
-  $(abspath $(PACKAGE_DIR)/$(if $(Package/$(1)/subdir),$(Package/$(1)/subdir),base)), \
+  $(if $(Package/$(1)/subdir), \
+    $(abspath $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(Package/$(1)/subdir)), \
+    $(PACKAGE_DIR)), \
  $(PACKAGE_DIR)))
 endef

 # 1: destination file
 define FeedSourcesAppend
 ( \
+  echo "src/gz %n_core %U/targets/%S/packages"; \
  $(strip $(if $(CONFIG_PER_FEED_REPO), \
-	$(foreach feed,base kernel $(FEEDS_ENABLED),echo "src/gz %n_$(feed) %U/$(feed)";) \
+	$(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %n_$(feed) %U/packages/%A/$(feed)";) \
 	$(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \
-		$(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$(feed) %U/$(feed)";)) \
-  , \
-	echo "src/gz %n %U"; \
-  )) \
+		$(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$(feed) %U/packages/%A/$(feed)";)))) \
 ) >> $(1)
 endef
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -5,21 +5,18 @@
 # See /LICENSE for more information.
 #

+include $(INCLUDE_DIR)/download.mk
+
 HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
 HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
 HOST_BUILD_PARALLEL ?=

-ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
-  HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
-else
-  HOST_MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
-endif
+HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j))

 ifeq ($(strip $(HOST_BUILD_PARALLEL)),0)
 HOST_JOBS?=-j1
 else
-HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\
-	$(if $(CONFIG_PKG_BUILD_PARALLEL),$(HOST_MAKE_J),-j1),-j1)
+HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL),$(HOST_MAKE_J),-j1)
 endif

 include $(INCLUDE_DIR)/host.mk
@@ -30,12 +27,11 @@ BUILD_TYPES += host
 HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),)))
 HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured
 HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
-HOST_BUILD_PREFIX:=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR)/host,$(STAGING_DIR_HOST))
+HOST_BUILD_PREFIX:=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR_HOSTPKG),$(STAGING_DIR_HOST))
 HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.$(PKG_NAME)_installed

 override MAKEFLAGS=

-include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk
 include $(INCLUDE_DIR)/autotools.mk

@@ -43,6 +39,7 @@ Host/Patch:=$(Host/Patch/Default)
 ifneq ($(strip $(HOST_UNPACK)),)
  define Host/Prepare/Default
 	$(HOST_UNPACK)
+	[ ! -d ./src/ ] || $(CP) ./src/* $(HOST_BUILD_DIR)
 	$(Host/Patch)
  endef
 endif
@@ -51,17 +48,12 @@ define Host/Prepare
  $(call Host/Prepare/Default)
 endef

-ifeq ($(HOST_OS),Darwin)
-  HOST_CFLAGS += -I/usr/local/opt/openssl/include
-  HOST_LDFLAGS += -L/usr/local/opt/openssl/lib
-endif
-
 HOST_CONFIGURE_VARS = \
 	CC="$(HOSTCC)" \
 	CFLAGS="$(HOST_CFLAGS)" \
 	CPPFLAGS="$(HOST_CPPFLAGS)" \
 	LDFLAGS="$(HOST_LDFLAGS)" \
-	SHELL="$(SHELL)"
+	CONFIG_SHELL="$(SHELL)"

 HOST_CONFIGURE_ARGS = \
 	--target=$(GNU_HOST_NAME) \
@@ -75,6 +67,12 @@ HOST_CONFIGURE_ARGS = \
 	--localstatedir=$(HOST_BUILD_PREFIX)/var \
 	--sbindir=$(HOST_BUILD_PREFIX)/bin

+HOST_MAKE_VARS = \
+	CFLAGS="$(HOST_CFLAGS)" \
+	CPPFLAGS="$(HOST_CPPFLAGS)" \
+	CXXFLAGS="$(HOST_CXXFLAGS)" \
+	LDFLAGS="$(HOST_LDFLAGS)"
+
 HOST_MAKE_FLAGS =

 HOST_CONFIGURE_CMD = $(BASH) ./configure
@@ -83,9 +81,9 @@ define Host/Configure/Default
 	$(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \
 		if [ -x configure ]; then \
 			$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \
+			$(HOST_CONFIGURE_VARS) \
 			$(2) \
 			$(HOST_CONFIGURE_CMD) \
-			$(HOST_CONFIGURE_VARS) \
 			$(HOST_CONFIGURE_ARGS) \
 			$(1); \
 		fi \
@@ -97,7 +95,8 @@ define Host/Configure
 endef

 define Host/Compile/Default
-	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+	+$(HOST_MAKE_VARS) \
+	$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
 		$(HOST_MAKE_FLAGS) \
 		$(1)
 endef
@@ -111,7 +110,7 @@ define Host/Install/Default
 endef

 define Host/Install
-  $(call Host/Install/Default)
+  $(call Host/Install/Default,$(HOST_BUILD_PREFIX))
 endef


@@ -122,18 +121,8 @@ ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
  endef
 endif

-define Download/default
-  FILE:=$(PKG_SOURCE)
-  URL:=$(PKG_SOURCE_URL)
-  PROTO:=$(PKG_SOURCE_PROTO)
-  SUBDIR:=$(PKG_SOURCE_SUBDIR)
-  VERSION:=$(PKG_SOURCE_VERSION)
-  MD5SUM:=$(PKG_MD5SUM)
-  MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM)
-endef
-
 define Host/Exports/Default
-  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-*)),-I $$(p))
+  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*)),-I $$(p))
  $(1) : export STAGING_PREFIX=$$(HOST_BUILD_PREFIX)
  $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig:$$(HOST_BUILD_PREFIX)/lib/pkgconfig
  $(1) : export PKG_CONFIG_LIBDIR=$$(HOST_BUILD_PREFIX)/lib/pkgconfig
@@ -145,9 +134,8 @@ Host/Exports=$(Host/Exports/Default)
 .NOTPARALLEL:

 ifndef DUMP
-  define HostBuild
+  define HostBuild/Core
  $(if $(HOST_QUILT),$(Host/Quilt))
-  $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
  $(if $(DUMP),,$(call HostHost/Autoclean))

  $(HOST_STAMP_PREPARED):
@@ -172,8 +160,9 @@ ifndef DUMP
 		$(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep))
 		touch $$@

+  $(call Host/Exports,$(HOST_STAMP_INSTALLED))
  $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE)
-		$(call Host/Install)
+		$(call Host/Install,$(HOST_BUILD_PREFIX))
 		$(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))
 		mkdir -p $$(shell dirname $$@)
 		touch $(HOST_STAMP_BUILT)
@@ -206,3 +195,8 @@ ifndef DUMP
  clean:

 endif
+
+define HostBuild
+  $(HostBuild/Core)
+  $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
+endef
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -0,0 +1,197 @@
+# Build commands that can be called from Device/* templates
+
+IMAGE_KERNEL = $(word 1,$^)
+IMAGE_ROOTFS = $(word 2,$^)
+
+define Build/uImage
+	mkimage -A $(LINUX_KARCH) \
+		-O linux -T kernel \
+		-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
+		-n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION))' -d $@ $@.new
+	@mv $@.new $@
+endef
+
+define Build/netgear-chk
+	$(STAGING_DIR_HOST)/bin/mkchkimg \
+		-o $@.new \
+		-k $@ \
+		-b $(NETGEAR_BOARD_ID) \
+		-r $(NETGEAR_REGION)
+	mv $@.new $@
+endef
+
+define Build/netgear-dni
+	$(STAGING_DIR_HOST)/bin/mkdniimg \
+		-B $(NETGEAR_BOARD_ID) -v LEDE.$(REVISION) \
+		$(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \
+		-r "$(1)" \
+		-i $@ -o $@.new
+	mv $@.new $@
+endef
+
+define Build/tplink-safeloader
+       -$(STAGING_DIR_HOST)/bin/tplink-safeloader \
+		-B $(TPLINK_BOARD_NAME) \
+		-V $(REVISION) \
+		-k $(IMAGE_KERNEL) \
+		-r $@ \
+		-o $@.new \
+		-j \
+		$(wordlist 2,$(words $(1)),$(1)) \
+		$(if $(findstring sysupgrade,$(word 1,$(1))),-S) && mv $@.new $@ || rm -f $@
+endef
+
+define Build/append-dtb
+	$(call Image/BuildDTB,$(if $(DEVICE_DTS_DIR),$(DEVICE_DTS_DIR),$(DTS_DIR))/$(DEVICE_DTS).dts,$@.dtb)
+	cat $@.dtb >> $@
+endef
+
+define Build/install-dtb
+	$(foreach dts,$(DEVICE_DTS), \
+		$(CP) \
+			$(DTS_DIR)/$(dts).dtb \
+			$(BIN_DIR)/$(IMG_PREFIX)-$(dts).dtb; \
+	)
+endef
+
+define Build/fit
+	$(TOPDIR)/scripts/mkits.sh \
+		-D $(DEVICE_NAME) -o $@.its -k $@ \
+		$(if $(word 2,$(1)),-d $(word 2,$(1))) -C $(word 1,$(1)) \
+		-a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
+		-A $(LINUX_KARCH) -v $(LINUX_VERSION)
+	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new
+	@mv $@.new $@
+endef
+
+define Build/lzma
+	$(call Build/lzma-no-dict,-lc1 -lp2 -pb2 $(1))
+endef
+
+define Build/lzma-no-dict
+	$(STAGING_DIR_HOST)/bin/lzma e $@ $(1) $@.new
+	@mv $@.new $@
+endef
+
+define Build/gzip
+	gzip -9n -c $@ $(1) > $@.new
+	@mv $@.new $@
+endef
+
+define Build/jffs2
+	rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 && \
+		mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(1)) && \
+		cp $@ $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$(1) && \
+		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad \
+			$(if $(CONFIG_BIG_ENDIAN),--big-endian,--little-endian) \
+			--squash-uids -v -e $(patsubst %k,%KiB,$(BLOCKSIZE)) \
+			-o $@.new \
+			-d $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 \
+			2>&1 1>/dev/null | awk '/^.+$$$$/' && \
+		$(STAGING_DIR_HOST)/bin/padjffs2 $@.new -J $(patsubst %k,,$(BLOCKSIZE))
+	-rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/
+	@mv $@.new $@
+endef
+
+define Build/kernel-bin
+	rm -f $@
+	cp $< $@
+endef
+
+define Build/patch-cmdline
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $@ '$(CMDLINE)'
+endef
+
+define Build/append-kernel
+	dd if=$(IMAGE_KERNEL) >> $@
+endef
+
+define Build/append-rootfs
+	dd if=$(IMAGE_ROOTFS) >> $@
+endef
+
+define Build/append-ubi
+	sh $(TOPDIR)/scripts/ubinize-image.sh \
+		$(if $(UBOOTENV_IN_UBI),--uboot-env) \
+		$(if $(KERNEL_IN_UBI),--kernel $(IMAGE_KERNEL)) \
+		$(foreach part,$(UBINIZE_PARTS),--part $(part)) \
+		$(IMAGE_ROOTFS) \
+		$@.tmp \
+		-p $(BLOCKSIZE:%k=%KiB) -m $(PAGESIZE) \
+		$(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \
+		$(if $(VID_HDR_OFFSET),-O $(VID_HDR_OFFSET)) \
+		$(UBINIZE_OPTS)
+	cat $@.tmp >> $@
+	rm $@.tmp
+endef
+
+define Build/pad-to
+	dd if=$@ of=$@.new bs=$(1) conv=sync
+	mv $@.new $@
+endef
+
+define Build/pad-extra
+	dd if=/dev/zero bs=$(1) count=1 >> $@
+endef
+
+define Build/pad-rootfs
+	$(STAGING_DIR_HOST)/bin/padjffs2 $@ $(1) \
+		$(if $(BLOCKSIZE),$(BLOCKSIZE:%k=%),4 8 16 64 128 256)
+endef
+
+define Build/pad-offset
+	let \
+		size="$$(stat -c%s $@)" \
+		pad="$(subst k,* 1024,$(word 1, $(1)))" \
+		offset="$(subst k,* 1024,$(word 2, $(1)))" \
+		pad="(pad - ((size + offset) % pad)) % pad" \
+		newsize='size + pad'; \
+		dd if=$@ of=$@.new bs=$$newsize count=1 conv=sync
+	mv $@.new $@
+endef
+
+define Build/check-size
+	@[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $@)" ] || { \
+		echo "WARNING: Image file $@ is too big" >&2; \
+		rm -f $@; \
+	}
+endef
+
+define Build/combined-image
+	-sh $(TOPDIR)/scripts/combined-image.sh \
+		"$(IMAGE_KERNEL)" \
+		"$@" \
+		"$@.new"
+	@mv $@.new $@
+endef
+
+define Build/sysupgrade-tar
+	sh $(TOPDIR)/scripts/sysupgrade-tar.sh \
+		--board $(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
+		--kernel $(call param_get_default,kernel,$(1),$(IMAGE_KERNEL)) \
+		--rootfs $(call param_get_default,rootfs,$(1),$(IMAGE_ROOTFS)) \
+		$@
+endef
+
+json_quote=$(subst ','\'',$(subst ",\",$(1)))
+#")')
+metadata_devices=$(if $(1),$(subst "$(space)","$(comma)",$(strip $(foreach v,$(1),"$(call json_quote,$(v))"))))
+metadata_json = \
+	'{ $(if $(IMAGE_METADATA),$(IMAGE_METADATA)$(comma)) \
+		"supported_devices":[$(call metadata_devices,$(1))], \
+		"version": { \
+			"dist": "$(call json_quote,$(VERSION_DIST))", \
+			"version": "$(call json_quote,$(VERSION_NUMBER))", \
+			"revision": "$(call json_quote,$(REVISION))", \
+			"board": "$(call json_quote,$(BOARD))" \
+		} \
+	}'
+
+define Build/append-metadata
+	$(if $(SUPPORTED_DEVICES),echo $(call metadata_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@)
+endef
+
+define Build/kernel2minor
+	kernel2minor -k $@ -r $@.new $(1)
+	mv $@.new $@
+endef
--- a/include/image-legacy.mk
+++ b/include/image-legacy.mk
@@ -0,0 +1,93 @@
+ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
+    define Image/mkfs/ubifs/generate
+	$(CP) ./ubinize$(1).cfg $(KDIR)
+	( cd $(KDIR); \
+		$(STAGING_DIR_HOST)/bin/ubinize \
+		$(if $($(PROFILE)_UBI_OPTS),$($(PROFILE)_UBI_OPTS),$(shell echo $(UBI_OPTS))) \
+		-o $(KDIR)/root$(1).ubi \
+		ubinize$(1).cfg \
+	)
+    endef
+
+    define Image/mkfs/ubifs/legacy
+
+        $(if $($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),
+		$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
+			$(if $($(PROFILE)_UBIFS_OPTS),$($(PROFILE)_UBIFS_OPTS),$(UBIFS_OPTS)) \
+			$(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \
+			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--compr=none) \
+			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--compr=lzo) \
+			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--compr=zlib) \
+			$(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \
+			--squash-uids \
+			-o $(KDIR)/root.ubifs \
+			-d $(TARGET_DIR)
+	)
+	$(call Image/Build,ubifs)
+
+        $(if $($(PROFILE)_UBI_OPTS)$(UBI_OPTS),
+		$(if $(wildcard ./ubinize.cfg),$(call Image/mkfs/ubifs/generate,))
+		$(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay))
+	)
+	$(if $(wildcard ./ubinize.cfg),$(call Image/Build,ubi))
+    endef
+endif
+
+LegacyDevice/Dump = $(Device/Dump)
+
+define LegacyDevice/Check
+  $(Device/Check/Common)
+  _TARGET_PREPARE := $$(if $$(_PROFILE_SET),legacy-images-prepare,prepare-disabled)
+  _TARGET := $$(if $$(_PROFILE_SET),legacy-images,install-disabled)
+  $$(if $$(_PROFILE_SET),install: legacy-images-make)
+  ifndef IB
+    $$(if $$(_PROFILE_SET),kernel_prepare: legacy-images-prepare-make)
+  endif
+endef
+
+ifdef TARGET_PER_DEVICE_ROOTFS
+  define Image/Build/Profile/Filesystem
+	cp $(KDIR)/root.$(2)+pkg=$(3) $(KDIR)/root.$(2)
+	$(call Image/Build/$(2),$(2))
+	$(call Image/Build/Profile,$(1),$(2))
+  endef
+else
+  Image/Build/Profile/Filesystem = $(Image/Build/Profile)
+endif
+
+define LegacyDevice/Build
+  $$(_TARGET): legacy-image-$(1)
+  $$(_TARGET_PREPARE): legacy-image-prepare-$(1)
+  .PHONY: legacy-image-prepare-$(1) legacy-image-$(1)
+
+  legacy-image-prepare-$(1):
+	$$(call Image/Prepare/Profile,$(1))
+
+  ifndef IB
+    ifdef CONFIG_TARGET_PER_DEVICE_ROOTFS
+      ROOTFS/$(1) := $(foreach fs,$(TARGET_FILESYSTEMS), \
+        $(KDIR)/root.$(fs)$$(strip $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),+pkg=$$(ROOTFS_ID/$(1)))) \
+      )
+
+      $$(ROOTFS/$(1)): target-dir-$$(ROOTFS_ID/$(1))
+      legacy-images-make: $$(if $$(_PROFILE_SET),$$(ROOTFS/$(1)))
+    endif
+  endif
+
+  legacy-image-$(1):
+	$$(call Image/BuildKernel/Profile,$(1))
+	$(foreach fs,$(TARGET_FILESYSTEMS),
+		$$(call Image/Build/Profile/Filesystem,$(1),$(fs),$$(ROOTFS_ID/$(1)))
+	)
+
+endef
+
+define LegacyDevice
+  $(call Device/InitProfile,$(1))
+  $(call Device/Default,$(1))
+  $(call LegacyDevice/Default,$(1))
+  $(call LegacyDevice/$(1),$(1))
+  $(call LegacyDevice/Check,$(1))
+  $(call LegacyDevice/$(if $(DUMP),Dump,Build),$(1))
+
+endef
--- a/include/image.mk
+++ b/include/image.mk
@@ -10,20 +10,41 @@ include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/version.mk
+include $(INCLUDE_DIR)/image-commands.mk
+
+ifndef IB
+  ifdef CONFIG_TARGET_PER_DEVICE_ROOTFS
+    TARGET_PER_DEVICE_ROOTFS := 1
+  endif
+endif
+
+include $(INCLUDE_DIR)/image-legacy.mk
+
+ifdef TARGET_PER_DEVICE_ROOTFS
+  include $(INCLUDE_DIR)/rootfs.mk
+endif

 override MAKE:=$(_SINGLE)$(SUBMAKE)
 override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE)

+target_params = $(subst +,$(space),$*)
+param_get = $(patsubst $(1)=%,%,$(filter $(1)=%,$(2)))
+param_get_default = $(firstword $(call param_get,$(1),$(2)) $(3))
+param_mangle = $(subst $(space),_,$(strip $(1)))
+param_unmangle = $(subst _,$(space),$(1))
+
+mkfs_packages_id = $(shell echo $(sort $(1)) | mkhash md5 | head -c 8)
+mkfs_target_dir = $(if $(call param_get,pkg,$(1)),$(KDIR)/target-dir-$(call param_get,pkg,$(1)),$(TARGET_DIR))
+
 KDIR=$(KERNEL_BUILD_DIR)
 KDIR_TMP=$(KDIR)/tmp
 DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts

-sanitize = $(call tolower,$(subst _,-,$(1)))
+IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-)
+IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-)
+IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call sanitize,$(VERSION_CODE))-)

-DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
-EXTRA_NAME_SANITIZED=$(call sanitize,$(EXTRA_IMAGE_NAME))
-
-IMG_PREFIX:=$(DIST_SANITIZED)-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(if $(EXTRA_NAME_SANITIZED),$(EXTRA_NAME_SANITIZED)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
+IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))

 MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt

@@ -59,9 +80,6 @@ SQUASHFSOPT := -b $(SQUASHFS_BLOCKSIZE)
 SQUASHFSOPT += -p '/dev d 755 0 0' -p '/dev/console c 600 0 0 5 1'
 SQUASHFSCOMP := gzip
 LZMA_XZ_OPTIONS := -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2
-ifeq ($(CONFIG_SQUASHFS_LZMA),y)
-  SQUASHFSCOMP := lzma $(LZMA_XZ_OPTIONS)
-endif
 ifeq ($(CONFIG_SQUASHFS_XZ),y)
  ifneq ($(filter arm x86 powerpc sparc,$(LINUX_KARCH)),)
    BCJ_FILTER:=-Xbcj $(LINUX_KARCH)
@@ -76,9 +94,8 @@ fs-types-$(CONFIG_TARGET_ROOTFS_JFFS2) += $(addprefix jffs2-,$(JFFS2_BLOCKSIZE))
 fs-types-$(CONFIG_TARGET_ROOTFS_JFFS2_NAND) += $(addprefix jffs2-nand-,$(NAND_BLOCKSIZE))
 fs-types-$(CONFIG_TARGET_ROOTFS_EXT4FS) += ext4
 fs-types-$(CONFIG_TARGET_ROOTFS_ISO) += iso
+fs-types-$(CONFIG_TARGET_ROOTFS_UBIFS) += ubifs
 fs-subtypes-$(CONFIG_TARGET_ROOTFS_JFFS2) += $(addsuffix -raw,$(addprefix jffs2-,$(JFFS2_BLOCKSIZE)))
-fs-subtypes-$(CONFIG_TARGET_ROOTFS_CPIOGZ) += cpiogz
-fs-subtypes-$(CONFIG_TARGET_ROOTFS_TARGZ) += targz

 TARGET_FILESYSTEMS := $(fs-types-y)

@@ -120,16 +137,23 @@ endef

 define Image/BuildKernel/MkuImage
 	mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
-		-n '$(call toupper,$(ARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $(4) $(5)
+		-n '$(call toupper,$(ARCH)) LEDE Linux-$(LINUX_VERSION)' -d $(4) $(5)
 endef

 define Image/BuildKernel/MkFIT
 	$(TOPDIR)/scripts/mkits.sh \
 		-D $(1) -o $(KDIR)/fit-$(1).its -k $(2) $(if $(3),-d $(3)) -C $(4) -a $(5) -e $(6) \
-		-A $(ARCH) -v $(LINUX_VERSION)
+		-A $(LINUX_KARCH) -v $(LINUX_VERSION)
 	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $(KDIR)/fit-$(1).its $(KDIR)/fit-$(1)$(7).itb
 endef

+ifdef CONFIG_TARGET_IMAGES_GZIP
+  define Image/Gzip
+	rm -f $(1).gz
+	gzip -9n $(1)
+  endef
+endif
+
 # $(1) source dts file
 # $(2) target dtb file
 # $(3) extra CPP flags
@@ -146,26 +170,30 @@ define Image/BuildDTB
 	$(RM) $(2).tmp
 endef

-define Image/mkfs/jffs2/sub
-		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) --pad -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
-		$(call add_jffs2_mark,$(KDIR)/root.jffs2-$(2))
+define Image/mkfs/jffs2/sub-raw
+	$(STAGING_DIR_HOST)/bin/mkfs.jffs2 \
+		$(2) \
+		-e $(patsubst %k,%KiB,$(1)) \
+		-o $@ -d $(call mkfs_target_dir,$(3)) \
+		-v 2>&1 1>/dev/null | awk '/^.+$$$$/'
 endef

-define Image/mkfs/jffs2/sub-raw
-		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2)-raw -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
+define Image/mkfs/jffs2/sub
+	$(call Image/mkfs/jffs2/sub-raw,$(1),--pad $(2),$(3))
+	$(call add_jffs2_mark,$@)
 endef

 define Image/mkfs/jffs2/template
-  Image/mkfs/jffs2-$(1) = $$(call Image/mkfs/jffs2/sub,$(1),$(1),$(JFFS2OPTS))
-  Image/mkfs/jffs2-$(1)-raw = $$(call Image/mkfs/jffs2/sub-raw,$(1),$(1),$(JFFS2OPTS))
+  Image/mkfs/jffs2-$(1) = $$(call Image/mkfs/jffs2/sub,$(1),$(JFFS2OPTS),$$(1))
+  Image/mkfs/jffs2-$(1)-raw = $$(call Image/mkfs/jffs2/sub-raw,$(1),$(JFFS2OPTS),$$(1))

 endef

 define Image/mkfs/jffs2-nand/template
  Image/mkfs/jffs2-nand-$(1) = \
 	$$(call Image/mkfs/jffs2/sub, \
-		$(word 2,$(subst -, ,$(1))),nand-$(1), \
-			$(JFFS2OPTS) --no-cleanmarkers --pagesize=$(word 1,$(subst -, ,$(1))))
+		$(word 2,$(subst -, ,$(1))), \
+			$(JFFS2OPTS) --no-cleanmarkers --pagesize=$(word 1,$(subst -, ,$(1))),$$(1))

 endef

@@ -173,7 +201,11 @@ $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
 $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))

 define Image/mkfs/squashfs
-	$(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
+	$(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
+		-nopad -noappend -root-owned \
+		-comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
+		-processors 1 \
+		$(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
 endef

 # $(1): board name
@@ -204,55 +236,16 @@ ifneq ($(CONFIG_NAND_SUPPORT),)

 endif

-ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
-    define Image/mkfs/ubifs/generate
-	$(CP) ./ubinize$(1).cfg $(KDIR)
-	( cd $(KDIR); \
-		$(STAGING_DIR_HOST)/bin/ubinize \
-		$(if $($(PROFILE)_UBI_OPTS), \
-			$(shell echo $($(PROFILE)_UBI_OPTS)), \
-			$(shell echo $(UBI_OPTS)) \
-		) \
-		-o $(KDIR)/root$(1).ubi \
-		ubinize$(1).cfg \
-	)
-    endef
-
-    define Image/mkfs/ubifs
-
-        ifneq ($($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),)
-		$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
-			$(if $($(PROFILE)_UBIFS_OPTS), \
-				$(shell echo $($(PROFILE)_UBIFS_OPTS)), \
-				$(shell echo $(UBIFS_OPTS)) \
-			) \
-			$(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \
-			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \
-			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \
-			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--force-compr=zlib) \
-			$(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \
-			--squash-uids \
-			-o $(KDIR)/root.ubifs \
-			-d $(TARGET_DIR)
-        endif
-	$(call Image/Build,ubifs)
-
-        ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),)
-		$(if $(wildcard ./ubinize.cfg),$(call Image/mkfs/ubifs/generate,))
-		$(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay))
-        endif
-	$(if $(wildcard ./ubinize.cfg),$(call Image/Build,ubi))
-    endef
-endif
-
-define Image/mkfs/cpiogz
-	( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9n >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz )
-endef
-
-define Image/mkfs/targz
-	$(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \
-		$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
-		-C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz
+define Image/mkfs/ubifs
+	$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
+		$(UBIFS_OPTS) $(call param_unmangle,$(call param_get,fs,$(1))) \
+		$(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \
+		$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--compr=none) \
+		$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--compr=lzo) \
+		$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--compr=zlib) \
+		$(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \
+		--squash-uids \
+		-o $@ -d $(call mkfs_target_dir,$(1))
 endef

 E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024*1024)))
@@ -260,242 +253,179 @@ E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024*1024)))
 define Image/mkfs/ext4
 	$(STAGING_DIR_HOST)/bin/make_ext4fs \
 		-l $(E2SIZE) -b $(CONFIG_TARGET_EXT4_BLOCKSIZE) \
-		-i $(CONFIG_TARGET_EXT4_MAXINODE) \
-		-m $(CONFIG_TARGET_EXT4_RESERVED_PCT) \
+		$(if $(CONFIG_TARGET_EXT4_RESERVED_PCT),-m $(CONFIG_TARGET_EXT4_RESERVED_PCT)) \
 		$(if $(CONFIG_TARGET_EXT4_JOURNAL),,-J) \
 		$(if $(SOURCE_DATE_EPOCH),-T $(SOURCE_DATE_EPOCH)) \
-		$(KDIR)/root.ext4 $(TARGET_DIR)/
+		$@ $(call mkfs_target_dir,$(1))/
 endef

-define Image/mkfs/prepare/default
-	# Use symbolic permissions to avoid clobbering SUID/SGID/sticky bits
-	- $(FIND) $(TARGET_DIR) -type f -not -perm /0100 -not -name 'ssh_host*' -not -name 'shadow' -print0 | $(XARGS) -0 chmod u+rw,g+r,o+r
-	- $(FIND) $(TARGET_DIR) -type f -perm /0100 -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
-	- $(FIND) $(TARGET_DIR) -type d -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
-	$(INSTALL_DIR) $(TARGET_DIR)/tmp $(TARGET_DIR)/overlay
-	chmod 1777 $(TARGET_DIR)/tmp
+define Image/Manifest
+	$(STAGING_DIR_HOST)/bin/opkg \
+		--offline-root $(TARGET_DIR) \
+		--add-arch all:100 \
+		--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200 list-installed > \
+		$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest
 endef

-define Image/mkfs/prepare
-	$(call Image/mkfs/prepare/default)
-endef
+ifdef CONFIG_TARGET_ROOTFS_TARGZ
+  define Image/Build/targz
+	$(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \
+		$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
+		-C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz
+  endef
+endif

+ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
+  define Image/Build/cpiogz
+	( cd $(TARGET_DIR); find . | cpio -o -H newc -R root:root | gzip -9n >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz )
+  endef
+endif

-define Image/Checksum
-	( cd ${BIN_DIR} ; \
-		$(FIND) -maxdepth 1 -type f \! -name 'md5sums'  -printf "%P\n" | sort | xargs $1 > $2 \
-	)
-endef
+mkfs_packages = $(filter-out @%,$(PACKAGES_$(call param_get,pkg,pkg=$(target_params))))
+mkfs_packages_add = $(filter-out -%,$(mkfs_packages))
+mkfs_packages_remove = $(patsubst -%,%,$(filter -%,$(mkfs_packages)))
+mkfs_cur_target_dir = $(call mkfs_target_dir,pkg=$(target_params))

-define BuildImage/mkfs
-  install: mkfs-$(1)
-  .PHONY: mkfs-$(1)
-  mkfs-$(1): kernel_prepare
-	$(Image/mkfs/$(1))
-	$(call Build/mkfs/default,$(1))
-	$(call Build/mkfs/$(1),$(1))
-  $(KDIR)/root.$(1): mkfs-$(1)
+opkg_target = \
+	$(call opkg,$(mkfs_cur_target_dir)) \
+		-f $(mkfs_cur_target_dir).conf

-endef
+target-dir-%: FORCE
+	rm -rf $(mkfs_cur_target_dir) $(mkfs_cur_target_dir).opkg
+	$(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir)
+	-mv $(mkfs_cur_target_dir)/etc/opkg $(mkfs_cur_target_dir).opkg
+	echo 'src default file://$(PACKAGE_DIR_ALL)' > $(mkfs_cur_target_dir).conf
+	$(if $(mkfs_packages_remove), \
+		-$(call opkg,$(mkfs_cur_target_dir)) remove \
+			$(mkfs_packages_remove))
+	$(if $(call opkg_package_files,$(mkfs_packages_add)), \
+		$(opkg_target) update && \
+		$(opkg_target) install \
+			$(call opkg_package_files,$(mkfs_packages_add)))
+	$(call prepare_rootfs,$(mkfs_cur_target_dir))
+	-mv $(mkfs_cur_target_dir).opkg $(mkfs_cur_target_dir)/etc/opkg
+	rm -f $(mkfs_cur_target_dir).conf

-# Build commands that can be called from Device/* templates
-define Build/uImage
-	mkimage -A $(LINUX_KARCH) \
-		-O linux -T kernel \
-		-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-		-n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new
-	@mv $@.new $@
-endef
+$(KDIR)/root.%: kernel_prepare
+	$(call Image/mkfs/$(word 1,$(target_params)),$(target_params))

-define Build/netgear-chk
-	$(STAGING_DIR_HOST)/bin/mkchkimg \
-		-o $@.new \
-		-k $@ \
-		-b $(NETGEAR_BOARD_ID) \
-		-r $(NETGEAR_REGION)
-	mv $@.new $@
-endef
-
-define Build/netgear-dni
-	$(STAGING_DIR_HOST)/bin/mkdniimg \
-		-B $(NETGEAR_BOARD_ID) -v OpenWrt.$(REVISION) \
-		$(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \
-		-r "$(1)" \
-		-i $@ -o $@.new
-	mv $@.new $@
-endef
-
-define Build/fit
-	$(TOPDIR)/scripts/mkits.sh \
-		-D $(DEVICE_NAME) -o $@.its -k $@ \
-		$(if $(word 2,$(1)),-d $(word 2,$(1))) -C $(word 1,$(1)) \
-		-a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-		-A $(ARCH) -v $(LINUX_VERSION)
-	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new
-	@mv $@.new $@
-endef
-
-define Build/lzma
-	$(call Build/lzma-no-dict,-lc1 -lp2 -pb2 $(1))
-endef
-
-define Build/lzma-no-dict
-	$(STAGING_DIR_HOST)/bin/lzma e $@ $(1) $@.new
-	@mv $@.new $@
-endef
-
-define Build/gzip
-	gzip -9n -c $@ $(1) > $@.new
-	@mv $@.new $@
-endef
-
-define Build/jffs2
-	rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 && \
-		mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(1)) && \
-		cp $@ $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$(1) && \
-		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad \
-			$(if $(CONFIG_BIG_ENDIAN),--big-endian,--little-endian) \
-			--squash-uids -v -e $(patsubst %k,%KiB,$(BLOCKSIZE)) \
-			-o $@.new \
-			-d $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 \
-			2>&1 1>/dev/null | awk '/^.+$$$$/' && \
-		$(STAGING_DIR_HOST)/bin/padjffs2 $@.new -J $(patsubst %k,,$(BLOCKSIZE))
-	-rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/
-	@mv $@.new $@
-endef
-
-define Build/kernel-bin
-	rm -f $@
-	cp $< $@
-endef
-
-define Build/patch-cmdline
-	$(STAGING_DIR_HOST)/bin/patch-cmdline $@ '$(CMDLINE)'
-endef
-
-define Build/append-kernel
-	dd if=$(word 1,$^) $(if $(1),bs=$(1) conv=sync) >> $@
-endef
-
-define Build/append-rootfs
-	dd if=$(word 2,$^) $(if $(1),bs=$(1) conv=sync) >> $@
-endef
-
-define Build/append-ubi
-	sh $(TOPDIR)/scripts/ubinize-image.sh \
-		$(if $(UBOOTENV_IN_UBI),--uboot-env) \
-		$(if $(KERNEL_IN_UBI),--kernel $(word 1,$^)) \
-		$(word 2,$^) \
-		$@.tmp \
-		-p $(BLOCKSIZE) -m $(PAGESIZE) -E 5 \
-		$(if $(SUBPAGESIZE),-s $(SUBPAGESIZE))
-	cat $@.tmp >> $@
-	rm $@.tmp
-endef
-
-define Build/pad-to
-	dd if=$@ of=$@.new bs=$(1) conv=sync
-	mv $@.new $@
-endef
-
-define Build/pad-rootfs
-	$(call prepare_generic_squashfs,$@ $(1))
-endef
-
-define Build/pad-offset
-	let \
-		size="$$(stat -c%s $@)" \
-		pad="$(word 1, $(1))" \
-		offset="$(word 2, $(1))" \
-		pad="(pad - ((size + offset) % pad)) % pad" \
-		newsize='size + pad'; \
-		dd if=$@ of=$@.new bs=$$newsize count=1 conv=sync
-	mv $@.new $@
-endef
-
-define Build/check-size
-	@[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $@)" ] || { \
-		echo "WARNING: Image file $@ is too big" >&2; \
-		rm -f $@; \
-	}
-endef
-
-define Build/combined-image
-	-sh $(TOPDIR)/scripts/combined-image.sh \
-		"$(word 1,$^)" \
-		"$@" \
-		"$@.new"
-	@mv $@.new $@
-endef
-
-define Build/sysupgrade-nand
-	sh $(TOPDIR)/scripts/sysupgrade-nand.sh \
-		--board $(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
-		--kernel $(word 1,$^) \
-		--rootfs $(word 2,$^) \
-		$@
+define Device/InitProfile
+  PROFILES := $(PROFILE)
+  DEVICE_TITLE :=
+  DEVICE_PACKAGES :=
+  DEVICE_DESCRIPTION = Build firmware images for $$(DEVICE_TITLE)
 endef

 define Device/Init
-  PROFILES := $(PROFILE)
  DEVICE_NAME := $(1)
  KERNEL:=
  KERNEL_INITRAMFS = $$(KERNEL)
  KERNEL_SIZE:=
  CMDLINE:=

+  IMAGES :=
  IMAGE_PREFIX := $(IMG_PREFIX)-$(1)
  IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2)
-  KERNEL_PREFIX = $(1)
+  KERNEL_PREFIX = $$(IMAGE_PREFIX)
  KERNEL_SUFFIX := -kernel.bin
+  KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
  KERNEL_IMAGE = $$(KERNEL_PREFIX)$$(KERNEL_SUFFIX)
  KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-initramfs
-  KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX)$$(KERNEL_SUFFIX)
+  KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX)$$(KERNEL_INITRAMFS_SUFFIX)
  KERNEL_INITRAMFS_NAME = $$(KERNEL_NAME)-initramfs
  KERNEL_INSTALL :=
  KERNEL_NAME := vmlinux
  KERNEL_DEPENDS :=
  KERNEL_SIZE :=

+  UBOOTENV_IN_UBI :=
+  KERNEL_IN_UBI :=
+  BLOCKSIZE :=
+  PAGESIZE :=
+  SUBPAGESIZE :=
+  VID_HDR_OFFSET :=
+  UBINIZE_OPTS :=
+  UBINIZE_PARTS :=
+  MKUBIFS_OPTS :=
+
+  FS_OPTIONS/ubifs = $$(MKUBIFS_OPTS)
+
+  DEVICE_DTS :=
+  DEVICE_DTS_DIR :=
+
+  BOARD_NAME :=
+  UIMAGE_NAME :=
+  SUPPORTED_DEVICES :=
+  IMAGE_METADATA :=
+
  FILESYSTEMS := $(TARGET_FILESYSTEMS)
 endef

+DEFAULT_DEVICE_VARS := \
+  DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_SIZE KERNEL_INITRAMFS_IMAGE \
+  DEVICE_DTS DEVICE_DTS_DIR BOARD_NAME CMDLINE \
+  UBOOTENV_IN_UBI KERNEL_IN_UBI \
+  BLOCKSIZE PAGESIZE SUBPAGESIZE VID_HDR_OFFSET \
+  UBINIZE_OPTS UIMAGE_NAME UBINIZE_PARTS \
+  SUPPORTED_DEVICES IMAGE_METADATA
+
 define Device/ExportVar
  $(1) : $(2):=$$($(2))

 endef
 define Device/Export
-  $(foreach var,$(DEVICE_VARS) DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE,$(call Device/ExportVar,$(1),$(var)))
+  $(foreach var,$(DEVICE_VARS) $(DEFAULT_DEVICE_VARS),$(call Device/ExportVar,$(1),$(var)))
  $(1) : FILESYSTEM:=$(2)
 endef

+ifdef IB
+  DEVICE_CHECK_PROFILE = $(filter $(1),DEVICE_$(PROFILE) $(PROFILE))
+else
+  DEVICE_CHECK_PROFILE = $(CONFIG_TARGET_$(if $(CONFIG_TARGET_MULTI_PROFILE),DEVICE_)$(call target_conf,$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)))_$(1))
+endif
+
+DEVICE_EXTRA_PACKAGES = $(call qstrip,$(CONFIG_TARGET_DEVICE_PACKAGES_$(call target_conf,$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)))_DEVICE_$(1)))
+
+define merge_packages
+  $(1) :=
+  $(foreach pkg,$(2),
+    $(1) := $$(strip $$(filter-out -$$(patsubst -%,%,$(pkg)) $$(patsubst -%,%,$(pkg)),$$($(1))) $(pkg))
+  )
+endef
+
+define Device/Check/Common
+  _PROFILE_SET = $$(strip $$(foreach profile,$$(PROFILES) DEVICE_$(1),$$(call DEVICE_CHECK_PROFILE,$$(profile))))
+  ifdef TARGET_PER_DEVICE_ROOTFS
+    $$(eval $$(call merge_packages,_PACKAGES,$$(DEVICE_PACKAGES) $$(call DEVICE_EXTRA_PACKAGES,$(1))))
+    ROOTFS_ID/$(1) := $$(if $$(_PROFILE_SET),$$(call mkfs_packages_id,$$(_PACKAGES)))
+    PACKAGES_$$(ROOTFS_ID/$(1)) := $$(_PACKAGES)
+  endif
+endef
+
 define Device/Check
-  _TARGET = $$(if $$(filter $(PROFILE),$$(PROFILES)),install,install-disabled)
-  _COMPILE_TARGET = $$(if $(if $(IB),,$(CONFIG_IB)$$(filter $(PROFILE),$$(PROFILES))),compile,compile-disabled)
+  $(Device/Check/Common)
+  KDIR_KERNEL_IMAGE := $(KDIR)/$(1)$$(KERNEL_SUFFIX)
+  _TARGET := $$(if $$(_PROFILE_SET),install-images,install-disabled)
+  ifndef IB
+    _COMPILE_TARGET := $$(if $(CONFIG_IB)$$(_PROFILE_SET),compile,compile-disabled)
+  endif
 endef

 ifndef IB
 define Device/Build/initramfs
  $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
-  $$(_TARGET): $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)
+  $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE))

  $(KDIR)/$$(KERNEL_INITRAMFS_NAME):: image_prepare
  $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
 	cp $$^ $$@

-  $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS)
+  $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
 	@rm -f $$@
 	$$(call concat_cmd,$$(KERNEL_INITRAMFS))
 endef
 endif

-define Device/Build/check_size
-	@[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $@)" ] || { \
-		echo "WARNING: Image file $@ is too big" >&2; \
-		rm -f $@; \
-	}
-endef
-
 define Device/Build/compile
  $$(_COMPILE_TARGET): $(KDIR)/$(1)
  $(eval $(call Device/Export,$(KDIR)/$(1)))
@@ -505,32 +435,45 @@ define Device/Build/compile
 endef

 define Device/Build/kernel
-  _KERNEL_IMAGES += $(KDIR)/$$(KERNEL_NAME)
  $(KDIR)/$$(KERNEL_NAME):: image_prepare
  $$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE))
-  $(call Device/Export,$(KDIR)/$$(KERNEL_IMAGE),$(1))
-  $(BIN_DIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_IMAGE)
+  $(call Device/Export,$$(KDIR_KERNEL_IMAGE),$(1))
+  $(BIN_DIR)/$$(KERNEL_IMAGE): $$(KDIR_KERNEL_IMAGE)
 	cp $$^ $$@
  ifndef IB
    ifdef CONFIG_IB
-      install: $(KDIR)/$$(KERNEL_IMAGE)
+      install: $$(KDIR_KERNEL_IMAGE)
    endif
-    $(KDIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS)
+    $$(KDIR_KERNEL_IMAGE): $(KDIR)/$$(KERNEL_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
 	@rm -f $$@
 	$$(call concat_cmd,$$(KERNEL))
-	$$(if $$(KERNEL_SIZE),$$(call Device/Build/check_size,$$(KERNEL_SIZE)))
+	$$(if $$(KERNEL_SIZE),$$(call Build/check-size,$$(KERNEL_SIZE)))
  endif
 endef

 define Device/Build/image
-  $$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2))
+  GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
+  $$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2))$$(GZ_SUFFIX)
  $(eval $(call Device/Export,$(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)),$(1)))
-  $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1)
+  ROOTFS/$(1)/$(3) := \
+	$(KDIR)/root.$(1)$$(strip \
+		$$(if $$(FS_OPTIONS/$(1)),+fs=$$(call param_mangle,$$(FS_OPTIONS/$(1)))) \
+	)$$(strip \
+		$(if $(TARGET_PER_DEVICE_ROOTFS),+pkg=$$(ROOTFS_ID/$(3))) \
+	)
+  ifndef IB
+    $$(ROOTFS/$(1)/$(3)): $(if $(TARGET_PER_DEVICE_ROOTFS),target-dir-$$(ROOTFS_ID/$(3)))
+  endif
+  $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $$(KDIR_KERNEL_IMAGE) $$(ROOTFS/$(1)/$(3))
 	@rm -f $$@
 	[ -f $$(word 1,$$^) -a -f $$(word 2,$$^) ]
 	$$(call concat_cmd,$(if $(IMAGE/$(2)/$(1)),$(IMAGE/$(2)/$(1)),$(IMAGE/$(2))))

  .IGNORE: $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2))
+
+  $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)).gz: $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2))
+	gzip -c -9n $$^ > $$@
+
  $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2))
 	cp $$^ $$@

@@ -548,25 +491,48 @@ define Device/Build
      $$(call Device/Build/image,$$(fs),$$(image),$(1)))))
 endef

+define Device/DumpInfo
+Target-Profile: DEVICE_$(1)
+Target-Profile-Name: $(DEVICE_TITLE)
+Target-Profile-Packages: $(DEVICE_PACKAGES)
+Target-Profile-Description:
+$(DEVICE_DESCRIPTION)
+@@
+
+endef
+
+define Device/Dump
+$$(eval $$(if $$(DEVICE_TITLE),$$(info $$(call Device/DumpInfo,$(1)))))
+endef
+
 define Device
+  $(call Device/InitProfile,$(1))
  $(call Device/Init,$(1))
  $(call Device/Default,$(1))
-  $(call Device/Check,$(1))
  $(call Device/$(1),$(1))
-  $(call Device/Build,$(1))
+  $(call Device/Check,$(1))
+  $(call Device/$(if $(DUMP),Dump,Build),$(1))

 endef

 define BuildImage

+  ifneq ($(DUMP),)
+    all: dumpinfo
+    dumpinfo: FORCE
+	@true
+  endif
+
  download:
  prepare:
  compile:
  clean:
+  legacy-images-prepare:
+  legacy-images:
  image_prepare:

  ifeq ($(IB),)
-    .PHONY: download prepare compile clean image_prepare mkfs_prepare kernel_prepare install
+    .PHONY: download prepare compile clean image_prepare kernel_prepare install install-images
    compile:
 		$(call Build/Compile)

@@ -574,30 +540,37 @@ define BuildImage
 		$(call Build/Clean)

    image_prepare: compile
-		mkdir -p $(KDIR)/tmp
+		mkdir -p $(BIN_DIR) $(KDIR)/tmp
 		$(call Image/Prepare)
+
+    legacy-images-prepare-make: image_prepare
+		$(MAKE) legacy-images-prepare
+
  else
    image_prepare:
-		mkdir -p $(KDIR)/tmp
+		mkdir -p $(BIN_DIR) $(KDIR)/tmp
  endif

-  mkfs_prepare: image_prepare
-	$(call Image/mkfs/prepare)
-
-  kernel_prepare: mkfs_prepare
+  kernel_prepare: image_prepare
+	$(call Image/Build/targz)
+	$(call Image/Build/cpiogz)
 	$(call Image/BuildKernel)
 	$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(if $(IB),,$(call Image/BuildKernel/Initramfs)))
 	$(call Image/InstallKernel)

  $(foreach device,$(TARGET_DEVICES),$(call Device,$(device)))
-  $(foreach fs,$(TARGET_FILESYSTEMS) $(fs-subtypes-y),$(call BuildImage/mkfs,$(fs)))
+  $(foreach device,$(LEGACY_DEVICES),$(call LegacyDevice,$(device)))

-  install: kernel_prepare
+  install-images: kernel_prepare $(foreach fs,$(filter-out $(if $(UBIFS_OPTS),,ubifs),$(TARGET_FILESYSTEMS) $(fs-subtypes-y)),$(KDIR)/root.$(fs))
 	$(foreach fs,$(TARGET_FILESYSTEMS),
 		$(call Image/Build,$(fs))
 	)
-	$(call Image/mkfs/ubifs)
-	$(call Image/Checksum,md5sum --binary,md5sums)
-	$(call Image/Checksum,openssl dgst -sha256,sha256sums)
+
+  legacy-images-make: install-images
+	$(call Image/mkfs/ubifs/legacy)
+	$(MAKE) legacy-images
+
+  install: install-images
+	$(call Image/Manifest)

 endef
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -6,13 +6,14 @@
 #
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/prereq.mk
+include $(INCLUDE_DIR)/depends.mk

 ifneq ($(DUMP),1)
  all: compile
 endif

-export QUILT=1
-STAMP_PREPARED:=$(LINUX_DIR)/.prepared
+KERNEL_FILE_DEPENDS=$(GENERIC_PATCH_DIR) $(PATCH_DIR) $(GENERIC_FILES_DIR) $(FILES_DIR)
+STAMP_PREPARED=$(LINUX_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,$(KERNEL_FILE_DEPENDS),)))
 STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
 include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk
@@ -42,7 +43,25 @@ endef
 define Download/kernel
  URL:=$(LINUX_SITE)
  FILE:=$(LINUX_SOURCE)
-  MD5SUM:=$(LINUX_KERNEL_MD5SUM)
+  HASH:=$(LINUX_KERNEL_HASH)
+endef
+
+KERNEL_GIT_OPTS:=
+ifneq ($(strip $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)),"")
+  KERNEL_GIT_OPTS+=--reference $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)
+endif
+
+ifneq ($(strip $(CONFIG_KERNEL_GIT_BRANCH)),"")
+  KERNEL_GIT_OPTS+=--branch $(CONFIG_KERNEL_GIT_BRANCH)
+endif
+
+define Download/git-kernel
+  URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI))
+  PROTO:=git
+  VERSION:=$(CONFIG_KERNEL_GIT_BRANCH)
+  FILE:=$(LINUX_SOURCE)
+  SUBDIR:=linux-$(LINUX_VERSION)
+  OPTS:=$(KERNEL_GIT_OPTS)
 endef

 ifdef CONFIG_COLLECT_KERNEL_DEBUG
@@ -60,12 +79,23 @@ ifdef CONFIG_COLLECT_KERNEL_DEBUG
  endef
 endif

+ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
+  ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
+    define Kernel/Autoclean
+      $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
+      $(call rdep,$(KERNEL_FILE_DEPENDS),$(STAMP_PREPARED),$(PKG_BUILD_DIR)/.dep_files,-x "*/.dep_*")
+    endef
+  endif
+endif
+
 define BuildKernel
  $(if $(QUILT),$(Build/Quilt))
  $(if $(LINUX_SITE),$(call Download,kernel))
+  $(if $(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),$(call Download,git-kernel))

  .NOTPARALLEL:

+  $(Kernel/Autoclean)
  $(STAMP_PREPARED): $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
 	-rm -rf $(KERNEL_BUILD_DIR)
 	-mkdir -p $(KERNEL_BUILD_DIR)
@@ -102,7 +132,7 @@ define BuildKernel
 		echo; \
 	) > $$@

-  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_KCONFIG_LIST) $(TOPDIR)/.config
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_KCONFIG_LIST) $(TOPDIR)/.config FORCE
 	$(Kernel/Configure)
 	touch $$@

@@ -130,7 +160,7 @@ define BuildKernel
 	rm -f $(LINUX_DIR)/.config.prev
 	rm -f $(STAMP_CONFIGURED)
 	$(LINUX_RECONF_CMD) > $(LINUX_DIR)/.config
-	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
+	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib -lncurses" $$@
 	$(LINUX_RECONF_DIFF) $(LINUX_DIR)/.config > $(LINUX_RECONFIG_TARGET)

  install: $(LINUX_DIR)/.image
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -5,6 +5,12 @@
 # See /LICENSE for more information.
 #

+ifneq ($(SOURCE_DATE_EPOCH),)
+  ifndef DUMP
+    KBUILD_BUILD_TIMESTAMP:=$(shell perl -e 'print scalar gmtime($(SOURCE_DATE_EPOCH))')
+  endif
+endif
+
 KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
 	HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \
 	CROSS_COMPILE="$(KERNEL_CROSS)" \
@@ -12,6 +18,9 @@ KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
 	KBUILD_HAVE_NLS=no \
 	KBUILD_BUILD_USER="$(call qstrip,$(CONFIG_KERNEL_BUILD_USER))" \
 	KBUILD_BUILD_HOST="$(call qstrip,$(CONFIG_KERNEL_BUILD_DOMAIN))" \
+	KBUILD_BUILD_TIMESTAMP="$(KBUILD_BUILD_TIMESTAMP)" \
+	KBUILD_BUILD_VERSION="0" \
+	HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib" \
 	CONFIG_SHELL="$(BASH)" \
 	$(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \
 	$(if $(PKG_BUILD_ID),LDFLAGS_MODULE=--build-id=0x$(PKG_BUILD_ID))
@@ -31,30 +40,25 @@ ifdef CONFIG_USE_SPARSE
  KERNEL_MAKEOPTS += C=1 CHECK=$(STAGING_DIR_HOST)/bin/sparse
 endif

+ifneq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
+ KERNEL_MAKEOPTS += LOCALVERSION=
+endif
+
 export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include

 # defined in quilt.mk
 Kernel/Patch:=$(Kernel/Patch/Default)

-KERNEL_GIT_OPTS:=
-ifneq ($(strip $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)),"")
-  KERNEL_GIT_OPTS+=--reference $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)
-endif
-
-ifneq ($(strip $(CONFIG_KERNEL_GIT_BRANCH)),"")
-  KERNEL_GIT_OPTS+=--branch $(CONFIG_KERNEL_GIT_BRANCH)
-endif
-
 ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
  ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
    define Kernel/Prepare/Default
 	xzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
 	$(Kernel/Patch)
-	touch $(LINUX_DIR)/.quilt_used
+	$(if $(QUILT),touch $(LINUX_DIR)/.quilt_used)
    endef
  else
    define Kernel/Prepare/Default
-	git clone $(KERNEL_GIT_OPTS) $(CONFIG_KERNEL_GIT_CLONE_URI) $(LINUX_DIR)
+	xzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
    endef
  endif
 else
@@ -105,13 +109,14 @@ define Kernel/SetNoInitramfs
 endef

 define Kernel/Configure/Default
+	rm -f $(LINUX_DIR)/localversion
 	$(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target
 # copy CONFIG_KERNEL_* settings over to .config.target
 	awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target
 	echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
 	echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
 	echo "CONFIG_KALLSYMS_UNCOMPRESSED=y" >> $(LINUX_DIR)/.config.target
-	$(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override
+	$(SCRIPT_DIR)/package-metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override
 	$(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config.set
 	$(call Kernel/SetNoInitramfs)
 	rm -rf $(KERNEL_BUILD_DIR)/modules
@@ -120,7 +125,7 @@ define Kernel/Configure/Default
 		cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev; \
 	}
 	$(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
-	$(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config.set | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
+	grep '=[ym]' $(LINUX_DIR)/.config.set | LC_ALL=C sort | mkhash md5 > $(LINUX_DIR)/.vermagic
 endef

 define Kernel/Configure/Initramfs
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -2,15 +2,11 @@

 LINUX_RELEASE?=1

-LINUX_VERSION-3.18 = .29
-LINUX_VERSION-4.1 = .20
-LINUX_VERSION-4.3 = .4
-LINUX_VERSION-4.4 = .7
+LINUX_VERSION-3.18 = .43
+LINUX_VERSION-4.4 = .89

-LINUX_KERNEL_MD5SUM-3.18.29 = b25737a0bc98e80d12200de93f239c28
-LINUX_KERNEL_MD5SUM-4.1.20 = 075c38a3a23ca5bc80437b13606df00a
-LINUX_KERNEL_MD5SUM-4.3.4 = 5275d02132107c28b85f986bad576d91
-LINUX_KERNEL_MD5SUM-4.4.7 = 4345597c9a10bd73c28b6ae3a854d8d7
+LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
+LINUX_KERNEL_HASH-4.4.89 = a81d1b1306e4fddee5d6f7219090a616073b02f4069e44522a9c0454b17f2b67

 ifdef KERNEL_PATCHVER
  LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
@@ -23,5 +19,5 @@ KERNEL=$(call merge_version,$(wordlist 1,2,$(call split_version,$(KERNEL_BASE)))
 KERNEL_PATCHVER ?= $(KERNEL)

 # disable the md5sum check for unknown kernel versions
-LINUX_KERNEL_MD5SUM:=$(LINUX_KERNEL_MD5SUM-$(strip $(LINUX_VERSION)))
-LINUX_KERNEL_MD5SUM?=x
+LINUX_KERNEL_HASH:=$(LINUX_KERNEL_HASH-$(strip $(LINUX_VERSION)))
+LINUX_KERNEL_HASH?=x
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -5,8 +5,15 @@
 # See /LICENSE for more information.
 #

+ifneq ($(filter check,$(MAKECMDGOALS)),)
+CHECK:=1
+DUMP:=1
+endif
+
 ifeq ($(__target_inc),)
-  include $(INCLUDE_DIR)/target.mk
+  ifndef CHECK
+    include $(INCLUDE_DIR)/target.mk
+  endif
 endif

 ifeq ($(DUMP),1)
@@ -30,8 +37,8 @@ else
  endif

  ifeq ($(TARGET_BUILD),1)
-    PATCH_DIR ?= ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
-    FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)")
+    PATCH_DIR ?= $(CURDIR)/patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+    FILES_DIR ?= $(foreach dir,$(wildcard $(CURDIR)/files $(CURDIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
  endif
  KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))
  LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
@@ -81,21 +88,23 @@ endif
 define KernelPackage/Defaults
  FILES:=
  AUTOLOAD:=
+  PKGFLAGS+=nonshared
 endef

 define ModuleAutoLoad
 	$(SH_FUNC) \
 	export modules=; \
 	probe_module() { \
-		mods="$$$$$$$$1"; \
-		boot="$$$$$$$$2"; \
+		local mods="$$$$$$$$1"; \
+		local boot="$$$$$$$$2"; \
+		local mod; \
 		shift 2; \
-		for mod in $(sort $$$$$$$$mods); do \
+		for mod in $$$$$$$$mods; do \
 			mkdir -p $(2)/etc/modules.d; \
 			echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$(1); \
 		done; \
 		if [ -e $(2)/etc/modules.d/$(1) ]; then \
-			if [ "$$$$$$$$boot" = "1" ]; then \
+			if [ "$$$$$$$$boot" = "1" -a ! -e $(2)/etc/modules-boot.d/$(1) ]; then \
 				mkdir -p $(2)/etc/modules-boot.d; \
 				ln -s ../modules.d/$(1) $(2)/etc/modules-boot.d/; \
 			fi; \
@@ -103,16 +112,17 @@ define ModuleAutoLoad
 		fi; \
 	}; \
 	add_module() { \
-		priority="$$$$$$$$1"; \
-		mods="$$$$$$$$2"; \
-		boot="$$$$$$$$3"; \
+		local priority="$$$$$$$$1"; \
+		local mods="$$$$$$$$2"; \
+		local boot="$$$$$$$$3"; \
+		local mod; \
 		shift 3; \
-		for mod in $(sort $$$$$$$$mods); do \
+		for mod in $$$$$$$$mods; do \
 			mkdir -p $(2)/etc/modules.d; \
 			echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \
 		done; \
 		if [ -e $(2)/etc/modules.d/$$$$$$$$priority-$(1) ]; then \
-			if [ "$$$$$$$$boot" = "1" ]; then \
+			if [ "$$$$$$$$boot" = "1" -a ! -e $(2)/etc/modules-boot.d/$$$$$$$$priority-$(1) ]; then \
 				mkdir -p $(2)/etc/modules-boot.d; \
 				ln -s ../modules.d/$$$$$$$$priority-$(1) $(2)/etc/modules-boot.d/; \
 			fi; \
@@ -121,6 +131,7 @@ define ModuleAutoLoad
 	}; \
 	$(3) \
 	if [ -n "$$$$$$$$modules" ]; then \
+		modules="$$$$$$$$(echo "$$$$$$$$modules" | tr ' ' '\n' | sort | uniq | paste -s -d' ' -)"; \
 		mkdir -p $(2)/etc/modules.d; \
 		mkdir -p $(2)/CONTROL; \
 		echo "#!/bin/sh" > $(2)/CONTROL/postinst-pkg; \
@@ -147,6 +158,7 @@ define KernelPackage
  $(eval $(call KernelPackage/Defaults))
  $(eval $(call KernelPackage/$(1)))
  $(eval $(call KernelPackage/$(1)/$(BOARD)))
+  $(eval $(call KernelPackage/$(1)/$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic)))

  define Package/kmod-$(1)
    TITLE:=$(TITLE)
@@ -155,9 +167,10 @@ define KernelPackage
    DESCRIPTION:=$(DESCRIPTION)
    EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC))
    VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
-    PACKAGE_SUBDIR:=$(if $(FEED),$(FEED),kernel)
+    PKGFLAGS:=$(PKGFLAGS)
    $(call KernelPackage/$(1))
    $(call KernelPackage/$(1)/$(BOARD))
+    $(call KernelPackage/$(1)/$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic))
  endef

  ifdef KernelPackage/$(1)/conffiles
@@ -214,7 +227,7 @@ $(call KernelPackage/$(1)/config)
  $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES))
 endef

-version_filter=$(if $(findstring @,$(1)),$(shell $(SCRIPT_DIR)/metadata.pl version_filter $(KERNEL_PATCHVER) $(1)),$(1))
+version_filter=$(if $(findstring @,$(1)),$(shell $(SCRIPT_DIR)/package-metadata.pl version_filter $(KERNEL_PATCHVER) $(1)),$(1))

 define AutoLoad
  add_module "$(1)" "$(call version_filter,$(2))" "$(3)";
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -32,19 +32,19 @@ endef
 # kernel only
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT,CONFIG_IP_NF_IPTABLES, $(P_V4)ip_tables),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT,CONFIG_NETFILTER_XTABLES, $(P_XT)x_tables),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT,CONFIG_NF_REJECT_IPV4, $(P_V4)nf_reject_ipv4),))

 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_NETFILTER_XTABLES, $(P_XT)xt_tcpudp),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_IP_NF_FILTER, $(P_V4)iptable_filter),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_IP_NF_MANGLE, $(P_V4)iptable_mangle),))

 # userland only
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_IP_NF_IPTABLES, xt_standard ipt_icmp xt_tcp xt_udp xt_comment xt_id xt_set xt_SET)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_IP_NF_IPTABLES, xt_standard ipt_icmp xt_tcp xt_udp xt_comment xt_set xt_SET)))

 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_LIMIT, $(P_XT)xt_limit))
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MAC, $(P_XT)xt_mac))
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MULTIPORT, $(P_XT)xt_multiport))
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_COMMENT, $(P_XT)xt_comment))
-$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_ID, $(P_XT)xt_id))

 #cluster
 $(eval $(call nf_add,IPT_CLUSTER,CONFIG_NETFILTER_XT_MATCH_CLUSTER, $(P_XT)xt_cluster))
@@ -54,7 +54,6 @@ $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)nf_log_comm
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_V4)nf_log_ipv4))
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_TCPMSS, $(P_XT)xt_TCPMSS))
 $(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)ipt_REJECT))
-$(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)nf_reject_ipv4))
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_TIME, $(P_XT)xt_time))
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MARK, $(P_XT)xt_mark))

@@ -72,7 +71,6 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_DEFRAG_IPV4, $(P_V4)
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_CONNTRACK_IPV4, $(P_V4)nf_conntrack_ipv4),))

 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_STATE, $(P_XT)xt_state))
-$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_RAW, $(P_V4)iptable_raw))
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_CT, $(P_XT)xt_CT))
 $(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_CONNTRACK, $(P_XT)xt_conntrack))

@@ -143,6 +141,7 @@ $(eval $(call nf_add,IPT_IPSEC,CONFIG_NETFILTER_XT_MATCH_POLICY, $(P_XT)xt_polic

 # kernel only
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT6,CONFIG_IP6_NF_IPTABLES, $(P_V6)ip6_tables),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT6,CONFIG_NF_REJECT_IPV6, $(P_V6)nf_reject_ipv6),))

 $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_DEFRAG_IPV6, $(P_V6)nf_defrag_ipv6),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_CONNTRACK_IPV6, $(P_V6)nf_conntrack_ipv6),))
@@ -150,7 +149,6 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_CONNTRACK_IPV6, $(P
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_FILTER, $(P_V6)ip6table_filter),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MANGLE, $(P_V6)ip6table_mangle),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_QUEUE, $(P_V6)ip6_queue),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_RAW, $(P_V6)ip6table_raw),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_NF_LOG_IPV6, $(P_V6)nf_log_ipv6),))

 $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6)))
@@ -158,7 +156,6 @@ $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_IPTABLES, ip6t_icmp

 $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_LOG, $(P_V6)ip6t_LOG))
 $(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_REJECT, $(P_V6)ip6t_REJECT))
-$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_REJECT, $(P_V6)nf_reject_ipv6))

 # ipv6 extra
 $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_IPV6HEADER, $(P_V6)ip6t_ipv6header))
@@ -175,12 +172,14 @@ $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt))
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_REDIRECT, $(P_XT)nf_nat_redirect, ge 3.19.0),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_MASQUERADE_IPV4, $(P_V4)nf_nat_masquerade_ipv4),))
+
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)nf_nat_ipv6),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_MASQUERADE_IPV6, $(P_V6)nf_nat_masquerade_ipv6),))

 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_NAT, $(P_XT)xt_nat),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_IP_NF_NAT, $(P_V4)iptable_nat),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_NAT, $(P_V6)ip6table_nat),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_NAT, $(P_V6)nf_nat_masquerade_ipv6),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_MASQUERADE, $(P_V6)ip6t_MASQUERADE),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, $(P_V6)ip6t_NPT),))

@@ -189,7 +188,6 @@ $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT,CONFIG_NF_NAT, ipt_SNAT ipt_DNAT))
 $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, ip6t_DNPT ip6t_SNPT)))

 $(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)ipt_MASQUERADE))
-$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)nf_nat_masquerade_ipv4))
 $(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_REDIRECT, $(P_XT)xt_REDIRECT))


@@ -324,8 +322,6 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LOG, $(P_XT)nft_log),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LIMIT, $(P_XT)nft_limit),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT, $(P_XT)nft_reject $(P_V4)nft_reject_ipv4 $(P_V6)nft_reject_ipv6),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT_INET, $(P_XT)nft_reject_inet),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_REJECT_IPV4, $(P_V4)nf_reject_ipv4),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_REJECT_IPV6, $(P_V6)nf_reject_ipv6),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV4, $(P_V4)nf_tables_ipv4),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV4, $(P_V4)nft_chain_route_ipv4),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV6, $(P_V6)nf_tables_ipv6),))
@@ -333,8 +329,6 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV6, $(P_V
 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REDIR, $(P_XT)nft_redir, ge 3.19.0),))

 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_NAT, $(P_XT)nft_nat),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NF_NAT_MASQUERADE_IPV4, $(P_V4)nf_nat_masquerade_ipv4),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NF_NAT_MASQUERADE_IPV6, $(P_V6)nf_nat_masquerade_ipv6),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_CHAIN_NAT_IPV4, $(P_V4)nft_chain_nat_ipv4),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_REDIR_IPV4, $(P_V4)nft_redir_ipv4, ge 3.19.0),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_REDIR_IPV6, $(P_V6)nft_redir_ipv6, ge 3.19.0),))
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -17,7 +17,6 @@ define Package/Default
  CONFIGFILE:=
  SECTION:=opt
  CATEGORY:=Extra packages
-  PACKAGE_SUBDIR:=$(FEED)
  DEPENDS:=
  MDEPENDS:=
  CONFLICTS:=
@@ -63,6 +62,7 @@ Build/Patch:=$(Build/Patch/Default)
 ifneq ($(strip $(PKG_UNPACK)),)
  define Build/Prepare/Default
 	$(PKG_UNPACK)
+	[ ! -d ./src/ ] || $(CP) ./src/* $(PKG_BUILD_DIR)
 	$(Build/Patch)
  endef
 endif
@@ -98,7 +98,7 @@ CONFIGURE_ARGS = \
 CONFIGURE_VARS = \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
 		CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \

@@ -137,7 +137,7 @@ MAKE_INSTALL_FLAGS = \
 	$(MAKE_FLAGS) \
 	DESTDIR="$(PKG_INSTALL_DIR)"

-MAKE_PATH = .
+MAKE_PATH ?= .

 define Build/Compile/Default
 	+$(MAKE_VARS) \
--- a/include/package-dumpinfo.mk
+++ b/include/package-dumpinfo.mk
@@ -41,7 +41,8 @@ $(if $(DEFAULT_VARIANT),Default-Variant: $(VARIANT)
 )$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES)
 )Section: $(SECTION)
 Category: $(CATEGORY)
-Title: $(TITLE)
+$(if $(filter nonshared,$(PKGFLAGS)),,Repository: $(if $(FEED),$(FEED),base)
+)Title: $(TITLE)
 Maintainer: $(MAINTAINER)
 $(if $(USERID),Require-User: $(USERID)
 )Source: $(PKG_SOURCE)
@@ -51,7 +52,6 @@ $(if $(PKG_LICENSE),License: $(PKG_LICENSE)
 $(if $(KCONFIG),Kernel-Config: $(KCONFIG)
 )$(if $(BUILDONLY),Build-Only: $(BUILDONLY)
 )$(if $(HIDDEN),Hidden: $(HIDDEN)
-)$(if $(PACKAGE_SUBDIR),Package-Subdir: $(PACKAGE_SUBDIR)
 )Description: $(if $(Package/$(1)/description),$(Package/$(1)/description),$(TITLE))
 $(if $(URL),$(URL)
 )$(MAINTAINER)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -5,7 +5,9 @@
 # See /LICENSE for more information.
 #

-include $(INCLUDE_DIR)/feeds.mk
+ifndef DUMP
+  include $(INCLUDE_DIR)/feeds.mk
+endif

 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
@@ -94,27 +96,34 @@ ifeq ($(DUMP),)
    KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))

    ifeq ($(BUILD_VARIANT),$$(if $$(VARIANT),$$(VARIANT),$(BUILD_VARIANT)))
+    do_install=
    ifdef Package/$(1)/install
+      do_install=yes
+    endif
+    ifdef Package/$(1)/install-overlay
+      do_install=yes
+    endif
+    ifdef do_install
      ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
        IPKGS += $(1)
        compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(STAGING_DIR_ROOT)/stamp/.$(1)_installed
        ifneq ($(ABI_VERSION),)
        compile: $(PKG_INFO_DIR)/$(1).version
        endif
+      else
+        $(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected))
+      endif

-        ifeq ($(CONFIG_PACKAGE_$(1)),y)
-          .PHONY: $(PKG_INSTALL_STAMP).$(1)
-          compile: $(PKG_INSTALL_STAMP).$(1)
-          $(PKG_INSTALL_STAMP).$(1):
+      .PHONY: $(PKG_INSTALL_STAMP).$(1)
+      compile: $(PKG_INSTALL_STAMP).$(1)
+      $(PKG_INSTALL_STAMP).$(1):
 			if [ -f $(PKG_INSTALL_STAMP).clean ]; then \
 				rm -f \
 					$(PKG_INSTALL_STAMP) \
 					$(PKG_INSTALL_STAMP).clean; \
-			fi; \
+			fi
+      ifeq ($(CONFIG_PACKAGE_$(1)),y)
 			echo "$(1)" >> $(PKG_INSTALL_STAMP)
-        endif
-      else
-        $(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected))
      endif
    endif
    endif
@@ -131,6 +140,7 @@ ifeq ($(DUMP),)
    $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg,1))
    $(eval $(call BuildIPKGVariable,$(1),postrm,,1))

+    $(STAGING_DIR_ROOT)/stamp/.$(1)_installed : export PATH=$$(TARGET_PATH_PKG)
    $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
 	rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
 	mkdir -p $(STAGING_DIR_ROOT)/stamp $(STAGING_DIR_ROOT)/tmp-$(1)
@@ -154,7 +164,7 @@ Package: $(1)
 Version: $(VERSION)
 $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
 )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
-)$$(call addfield,Provides,$(PROVIDES)
+)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES))
 )$$(call addfield,Source,$(SOURCE)
 )$$(call addfield,License,$$(PKG_LICENSE)
 )$$(call addfield,LicenseFiles,$$(PKG_LICENSE_FILES)
@@ -170,10 +180,13 @@ $(_endef)
    $(PKG_INFO_DIR)/$(1).provides: $$(IPKG_$(1))
    $$(IPKG_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL)
    $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description)
+    $$(IPKG_$(1)) : export PATH=$$(TARGET_PATH_PKG)
    $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
-	@rm -rf $$(PDIR_$(1))/$(1)_* $$(IDIR_$(1))
+	@rm -rf $$(IDIR_$(1)) $$(call opkg_package_files,$(1))
 	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR)
 	$(call Package/$(1)/install,$$(IDIR_$(1)))
+	$(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay)
+	$(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay)
 	-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf
 	@( \
 		find $$(IDIR_$(1)) -name lib\*.so\* -or -name \*.ko | awk -F/ '{ print $$$$NF }'; \
@@ -196,11 +209,13 @@ $(_endef)
 		( \
 			echo "#!/bin/sh"; \
 			echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \
+			echo "[ -x "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \
 			echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
 			echo "default_postinst \$$$$0 \$$$$@"; \
 		) > postinst; \
 		( \
 			echo "#!/bin/sh"; \
+			echo "[ -x "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \
 			echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
 			echo "default_prerm \$$$$0 \$$$$@"; \
 		) > prerm; \
@@ -226,7 +241,7 @@ $(_endef)
 	@[ -f $$(IPKG_$(1)) ]

    $(1)-clean:
-	rm -f $$(PDIR_$(1))/$(1)_*
+	$$(if $$(call opkg_package_files,$(1)),rm -f $$(call opkg_package_files,$(1)))

    clean: $(1)-clean

--- a/include/package.mk
+++ b/include/package.mk
@@ -7,26 +7,22 @@

 __package_mk:=1

-all: $(if $(DUMP),dumpinfo,compile)
+all: $(if $(DUMP),dumpinfo,$(if $(CHECK),check,compile))
+
+include $(INCLUDE_DIR)/download.mk

 PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
 PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
-PKG_MD5SUM ?= unknown
 PKG_BUILD_PARALLEL ?=
 PKG_USE_MIPS16 ?= 1
 PKG_IREMAP ?= 1

-ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
-  MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
-else
-  MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
-endif
+MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j))

 ifeq ($(strip $(PKG_BUILD_PARALLEL)),0)
 PKG_JOBS?=-j1
 else
-PKG_JOBS?=$(if $(PKG_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\
-	$(if $(CONFIG_PKG_BUILD_PARALLEL),$(MAKE_J),-j1),-j1)
+PKG_JOBS?=$(if $(PKG_BUILD_PARALLEL),$(MAKE_J),-j1)
 endif
 ifdef CONFIG_USE_MIPS16
  ifeq ($(strip $(PKG_USE_MIPS16)),1)
@@ -64,7 +60,7 @@ else
  STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))$(call confvar,$(PKG_PREPARED_DEPENDS)))
 endif
 STAMP_CONFIGURED=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS)))
-STAMP_CONFIGURED_WILDCARD=$(patsubst %_$(call confvar,$(PKG_CONFIG_DEPENDS)),%_*,$(STAMP_CONFIGURED))
+STAMP_CONFIGURED_WILDCARD=$(PKG_BUILD_DIR)/.configured_*
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
 STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_DIR_NAME)$(if $(BUILD_VARIANT),.$(BUILD_VARIANT),)_installed

@@ -93,7 +89,6 @@ endif

 PKG_INSTALL_STAMP:=$(PKG_INFO_DIR)/$(PKG_DIR_NAME).$(if $(BUILD_VARIANT),$(BUILD_VARIANT),default).install

-include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk
 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
@@ -118,17 +113,6 @@ ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
  endif
 endif

-define Download/default
-  FILE:=$(PKG_SOURCE)
-  URL:=$(PKG_SOURCE_URL)
-  SUBDIR:=$(PKG_SOURCE_SUBDIR)
-  PROTO:=$(PKG_SOURCE_PROTO)
-  $(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
-  $(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM))
-  VERSION:=$(PKG_SOURCE_VERSION)
-  MD5SUM:=$(PKG_MD5SUM)
-endef
-
 ifdef USE_GIT_TREE
  define Build/Prepare/Default
 	mkdir -p $(PKG_BUILD_DIR)
@@ -156,9 +140,8 @@ define Build/Exports/Default
 endef
 Build/Exports=$(Build/Exports/Default)

-define Build/DefaultTargets
+define Build/CoreTargets
  $(if $(QUILT),$(Build/Quilt))
-  $(if $(USE_SOURCE_DIR)$(USE_GIT_TREE),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
  $(call Build/Autoclean)

  download:
@@ -167,7 +150,7 @@ define Build/DefaultTargets
 	)

  $(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG)
-  $(STAMP_PREPARED):
+  $(STAMP_PREPARED): $(STAMP_PREPARED_DEPENDS)
 	@-rm -rf $(PKG_BUILD_DIR)
 	@mkdir -p $(PKG_BUILD_DIR)
 	$(foreach hook,$(Hooks/Prepare/Pre),$(call $(hook))$(sep))
@@ -176,7 +159,7 @@ define Build/DefaultTargets
 	touch $$@

  $(call Build/Exports,$(STAMP_CONFIGURED))
-  $(STAMP_CONFIGURED): $(STAMP_PREPARED)
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(STAMP_CONFIGURED_DEPENDS)
 	$(CleanStaging)
 	$(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
 	$(Build/Configure)
@@ -185,7 +168,7 @@ define Build/DefaultTargets
 	touch $$@

  $(call Build/Exports,$(STAMP_BUILT))
-  $(STAMP_BUILT): $(STAMP_CONFIGURED)
+  $(STAMP_BUILT): $(STAMP_CONFIGURED) $(STAMP_BUILT_DEPENDS)
 	$(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep))
 	$(Build/Compile)
 	$(foreach hook,$(Hooks/Compile/Post),$(call $(hook))$(sep))
@@ -223,15 +206,20 @@ define Build/DefaultTargets
    compile: $(STAMP_INSTALLED)
  endif

-  define Build/DefaultTargets
-  endef
-
  prepare: $(STAMP_PREPARED)
  configure: $(STAMP_CONFIGURED)
  dist: $(STAMP_CONFIGURED)
  distcheck: $(STAMP_CONFIGURED)
 endef

+define Build/DefaultTargets
+  $(if $(USE_SOURCE_DIR)$(USE_GIT_TREE),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
+  $(if $(DUMP),,$(Build/CoreTargets))
+
+  define Build/DefaultTargets
+  endef
+endef
+
 define Build/IncludeOverlay
  $(eval -include $(wildcard $(TOPDIR)/overlay/*/$(PKG_DIR_NAME).mk))
  define Build/IncludeOverlay
@@ -263,14 +251,14 @@ endif
  )

  $(if $(DUMP), \
-    $(Dumpinfo/Package), \
+    $(if $(CHECK),,$(Dumpinfo/Package)), \
    $(foreach target, \
      $(if $(Package/$(1)/targets),$(Package/$(1)/targets), \
        $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg) \
      ), $(BuildTarget/$(target)) \
    ) \
  )
-  $(if $(PKG_HOST_ONLY)$(DUMP),,$(call Build/DefaultTargets,$(1)))
+  $(if $(PKG_HOST_ONLY),,$(call Build/DefaultTargets,$(1)))
 endef

 define pkg_install_files
@@ -294,11 +282,11 @@ Build/DistCheck=$(call Build/DistCheck/Default,)
 prepare-package-install:
 	@mkdir -p $(PKG_INFO_DIR)
 	@touch $(PKG_INSTALL_STAMP).clean
-	@echo "$(filter-out essential,$(PKG_FLAGS))" > $(PKG_INSTALL_STAMP).flags
+	@echo "$(filter-out essential nonshared,$(PKG_FLAGS))" > $(PKG_INSTALL_STAMP).flags

 $(PACKAGE_DIR):
 	mkdir -p $@
-	
+
 dumpinfo:
 download:
 prepare:
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -20,10 +20,14 @@ $(eval $(call TestHostCommand,working-make, \
 	$(MAKE) -v | grep -E 'Make (3\.8[1-9]|3\.9[0-9]|[4-9]\.)'))

 $(eval $(call TestHostCommand,case-sensitive-fs, \
-	OpenWrt can only be built on a case-sensitive filesystem, \
+	LEDE can only be built on a case-sensitive filesystem, \
 	rm -f $(TMP_DIR)/test.*; touch $(TMP_DIR)/test.fs; \
 		test ! -f $(TMP_DIR)/test.FS))

+$(eval $(call TestHostCommand,proper-umask, \
+	Please build with umask 022 - other values produce broken packages, \
+	umask | grep -xE 00[012][012]))
+
 $(eval $(call SetupHostCommand,gcc, \
 	Please install the GNU C Compiler (gcc), \
 	$(CC) --version | grep gcc, \
@@ -71,11 +75,6 @@ $(eval $(call TestHostCommand,zlib, \
 	echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
 		gcc -include zlib.h -x c -o $(TMP_DIR)/a.out - $(zlib_link_flags)))

-$(eval $(call TestHostCommand,libssl, \
-	Please install the openssl library (with development headers), \
-	echo 'int main(int argc, char **argv) { SSL_library_init(); return 0; }' | \
-		gcc $(HOST_CFLAGS) -include openssl/ssl.h -x c -o $(TMP_DIR)/a.out - -lcrypto -lssl $(HOST_LDFLAGS)))
-
 $(eval $(call TestHostCommand,perl-thread-queue, \
 	Please install the Perl Thread::Queue module, \
 	perl -MThread::Queue -e 1))
@@ -102,8 +101,8 @@ $(eval $(call SetupHostCommand,diff,Please install diffutils, \
 	diff --version 2>&1 | grep diff))

 $(eval $(call SetupHostCommand,cp,Please install GNU fileutils, \
-	gcp --help, \
-	cp --help))
+	gcp --help 2>&1 | grep 'Copy SOURCE', \
+	cp --help 2>&1 | grep 'Copy SOURCE'))

 $(eval $(call SetupHostCommand,seq,, \
 	gseq --version, \
@@ -128,11 +127,6 @@ $(eval $(call SetupHostCommand,stat,Cannot find a file stat utility, \
 	gstat -c%s $(TMP_DIR)/.host.mk, \
 	stat -c%s $(TMP_DIR)/.host.mk))

-$(eval $(call SetupHostCommand,md5sum,, \
-	gmd5sum /dev/null | grep d41d8cd98f00b204e9800998ecf8427e, \
-	md5sum /dev/null | grep d41d8cd98f00b204e9800998ecf8427e, \
-	$(SCRIPT_DIR)/md5sum /dev/null | grep d41d8cd98f00b204e9800998ecf8427e))
-
 $(eval $(call SetupHostCommand,unzip,Please install 'unzip', \
 	unzip 2>&1 | grep zipfile, \
 	unzip))
@@ -151,18 +145,17 @@ $(eval $(call SetupHostCommand,python,Please install Python 2.x, \
 	python2 -V 2>&1 | grep Python, \
 	python -V 2>&1 | grep Python))

-$(eval $(call SetupHostCommand,svn,Please install the Subversion client, \
-	svn --version | grep Subversion))
-
 $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \
 	git --exec-path | xargs -I % -- grep -q -- --recursive %/git-submodule))

 $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
 	file --version 2>&1 | grep file))

-$(eval $(call SetupHostCommand,openssl,Please install the 'openssl' utility, \
-	openssl version | grep '\(OpenSSL\|LibreSSL\)'))
+$(STAGING_DIR_HOST)/bin/mkhash: $(SCRIPT_DIR)/mkhash.c
+	mkdir -p $(dir $@)
+	$(CC) -O2 -I$(TOPDIR)/tools/include -o $@ $<

+prereq: $(STAGING_DIR_HOST)/bin/mkhash

 # Install ldconfig stub
 $(eval $(call TestHostCommand,ldconfig-stub,Failed to install stub, \
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -91,7 +91,7 @@ endef

 kernel_files=$(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.)
 define Kernel/Patch/Default
-	rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches
+	$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
 	$(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/)
 	find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f
 	$(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/)
@@ -149,7 +149,8 @@ define Quilt/Template
 		echo "The source directory contains no quilt patches."; \
 		false; \
 	}
-	@[ -n "$$$$(ls $(1)/patches/series)" -o "$$$$(cat $(1)/patches/series | md5sum)" = "$$(sort $(1)/patches/series | md5sum)" ] || { \
+	@[ -n "$$$$(ls $(1)/patches/series)" -o \
+	   "$$$$(cat $(1)/patches/series | mkhash md5)" = "$$(sort $(1)/patches/series | mkhash md5)" ] || { \
 		echo "The patches are not sorted in the right order. Please fix."; \
 		false; \
 	}
--- a/include/rootfs.mk
+++ b/include/rootfs.mk
@@ -0,0 +1,88 @@
+include $(INCLUDE_DIR)/feeds.mk
+
+ifdef CONFIG_USE_MKLIBS
+  define mklibs
+	rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out
+	# first find all programs and add them to the mklibs list
+	find $(STAGING_DIR_ROOT) -type f -perm /100 -exec \
+		file -r -N -F '' {} + | \
+		awk ' /executable.*dynamically/ { print $$1 }' > $(TMP_DIR)/mklibs-progs
+	# find all loadable objects that are not regular libraries and add them to the list as well
+	find $(STAGING_DIR_ROOT) -type f -name \*.so\* -exec \
+		file -r -N -F '' {} + | \
+		awk ' /shared object/ { print $$1 }' > $(TMP_DIR)/mklibs-libs
+	mkdir -p $(TMP_DIR)/mklibs-out
+	$(STAGING_DIR_HOST)/bin/mklibs -D \
+		-d $(TMP_DIR)/mklibs-out \
+		--sysroot $(STAGING_DIR_ROOT) \
+		`cat $(TMP_DIR)/mklibs-libs | sed 's:/*[^/]\+/*$$::' | uniq | sed 's:^$(STAGING_DIR_ROOT):-L :'` \
+		--ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \
+			$(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so ld-musl-*.so.*, \
+			  $(STAGING_DIR_ROOT)/lib/$(name) \
+			)))) \
+		--target $(REAL_GNU_TARGET_NAME) \
+		`cat $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-libs` 2>&1
+	$(RSTRIP) $(TMP_DIR)/mklibs-out
+	for lib in `ls $(TMP_DIR)/mklibs-out/*.so.* 2>/dev/null`; do \
+		LIB="$${lib##*/}"; \
+		DEST="`ls "$(1)/lib/$$LIB" "$(1)/usr/lib/$$LIB" 2>/dev/null`"; \
+		[ -n "$$DEST" ] || continue; \
+		echo "Copying stripped library $$lib to $$DEST"; \
+		cp "$$lib" "$$DEST" || exit 1; \
+	done
+  endef
+endif
+
+# where to build (and put) .ipk packages
+opkg = \
+  IPKG_NO_SCRIPT=1 \
+  IPKG_INSTROOT=$(1) \
+  TMPDIR=$(1)/tmp \
+  $(STAGING_DIR_HOST)/bin/opkg \
+	--offline-root $(1) \
+	--force-postinstall \
+	--add-dest root:/ \
+	--add-arch all:100 \
+	--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
+
+TARGET_DIR_ORIG := $(TARGET_ROOTFS_DIR)/root.orig-$(BOARD)
+
+ifdef CONFIG_CLEAN_IPKG
+  define clean_ipkg
+	-find $(1)/usr/lib/opkg -type f -and -not -name '*.control' | $(XARGS) rm -rf
+	-sed -i -ne '/^Require-User: /p' $(1)/usr/lib/opkg/info/*.control
+	-find $(1)/usr/lib/opkg -empty | $(XARGS) rm -rf
+  endef
+endif
+
+define prepare_rootfs
+	@if [ -d $(TOPDIR)/files ]; then \
+		$(call file_copy,$(TOPDIR)/files/.,$(1)); \
+	fi
+	@mkdir -p $(1)/etc/rc.d
+	@( \
+		cd $(1); \
+		for script in ./usr/lib/opkg/info/*.postinst; do \
+			IPKG_INSTROOT=$(1) $$(which bash) $$script; \
+			ret=$$?; \
+			if [ $$ret -ne 0 ]; then \
+				echo "postinst script $$script has failed with exit code $$ret" >&2; \
+				exit 1; \
+			fi; \
+		done; \
+		for script in ./etc/init.d/*; do \
+			grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
+			IPKG_INSTROOT=$(1) $$(which bash) ./etc/rc.common $$script enable; \
+		done || true \
+	)
+	$(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status)
+	@-find $(1) -name CVS   | $(XARGS) rm -rf
+	@-find $(1) -name .svn  | $(XARGS) rm -rf
+	@-find $(1) -name .git  | $(XARGS) rm -rf
+	@-find $(1) -name '.#*' | $(XARGS) rm -f
+	rm -f $(1)/usr/lib/opkg/lists/*
+	rm -f $(1)/usr/lib/opkg/info/*.postinst*
+	rm -f $(1)/usr/lib/opkg/info/*.prerm*
+	$(call clean_ipkg,$(1))
+	$(call mklibs,$(1))
+endef
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -28,7 +28,7 @@ endef

 define PackageDir
  $(TMP_DIR)/.$(SCAN_TARGET): $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1)
-  $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(2)/Makefile $(SCAN_STAMP) $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(2)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(2)/$(DEP))))
+  $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(2)/Makefile $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(2)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(2)/$(DEP))))
 	{ \
 		$$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \
 		echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \
@@ -40,7 +40,8 @@ define PackageDir
 			rm -f $$@; \
 		}; \
 		echo; \
-	} > $$@ || true
+	} > $$@.tmp
+	mv $$@.tmp $$@
 endef

 $(OVERRIDELIST):
@@ -50,7 +51,7 @@ $(OVERRIDELIST):
 ifeq ($(SCAN_NAME),target)
  GREP_STRING=BuildTarget
 else
-  GREP_STRING=(Build/DefaultTargets|BuildPackage|.+Package)
+  GREP_STRING=(Build/DefaultTargets|BuildPackage|KernelPackage)
 endif

 $(FILELIST): $(OVERRIDELIST)
@@ -76,14 +77,15 @@ $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
 			print "$$(eval $$(call PackageDir," info "," dir "," pkg "))"; \
 		} ' < $<; \
 		true; \
-	) > $@
+	) > $@.tmp
+	mv $@.tmp $@

 -include $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk

 $(TARGET_STAMP)::
 	+( \
 		$(NO_TRACE_MAKE) $(FILELIST); \
-		MD5SUM=$$(cat $(FILELIST) $(OVERRIDELIST) | (md5sum || md5) 2>/dev/null | awk '{print $$1}'); \
+		MD5SUM=$$(cat $(FILELIST) $(OVERRIDELIST) | mkhash md5 | awk '{print $$1}'); \
 		[ -f "$@.$$MD5SUM" ] || { \
 			rm -f $@.*; \
 			touch $@.$$MD5SUM; \
@@ -91,7 +93,7 @@ $(TARGET_STAMP)::
 		} \
 	)

-$(TMP_DIR)/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP)
+$(TMP_DIR)/.$(SCAN_TARGET): $(TARGET_STAMP)
 	$(call progress,Collecting $(SCAN_NAME) info: merging...)
 	-cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@ 2>/dev/null
 	$(call progress,Collecting $(SCAN_NAME) info: done)
--- a/include/scons.mk
+++ b/include/scons.mk
@@ -4,7 +4,7 @@ SCONS_VARS = \
 	CC="$(TARGET_CC_NOCACHE)" \
 	CXX="$(TARGET_CXX_NOCACHE)" \
 	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-	CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+	CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
 	CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
 	DESTDIR="$(PKG_INSTALL_DIR)"
--- a/include/shell.sh
+++ b/include/shell.sh
@@ -13,25 +13,3 @@ isset() {
 	eval "var=\"\${$1}\""
 	[ -n "$var" ]
 }
-
-trapret() {(
-	local retvals="$1"; shift
-	local cmd="$1"; shift
-	for retval in $(echo $retvals); do
-		local trap_$retval=1
-	done
-	"$cmd" "$@" || {
-		local retval="$?"
-		eval "trapped=\${trap_$retval}"
-		[ -n "$trapped" ] || {
-			return $retval
-		}
-	}
-)}
-
-md5s() {
-	cat "$@" | (
-		md5sum 2>/dev/null ||
-		md5
-	) | awk '{print $1}'
-}
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -9,7 +9,7 @@ ifeq ($(MAKECMDGOALS),prereq)
  SUBTARGETS:=prereq
  PREREQ_ONLY:=1
 else
-  SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure
+  SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure check
 endif

 subtarget-default = $(filter-out ., \
--- a/include/target.mk
+++ b/include/target.mk
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2016 LEDE Project
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,7 +13,7 @@ __target_inc=1
 DEVICE_TYPE?=router

 # Default packages - the really basic set
-DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch
+DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd
 # For nas targets
 DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm
 # For router targets
@@ -58,6 +59,7 @@ extra_packages = $(if $(filter wpad-mini wpad nas,$(1)),iwinfo)

 define ProfileDefault
  NAME:=
+  PRIORITY:=
  PACKAGES:=
 endef

@@ -65,25 +67,16 @@ ifndef Profile
 define Profile
  $(eval $(call ProfileDefault))
  $(eval $(call Profile/$(1)))
-  dumpinfo : $(call shexport,Profile/$(1)/Config)
  dumpinfo : $(call shexport,Profile/$(1)/Description)
  DUMPINFO += \
 	echo "Target-Profile: $(1)"; \
+	$(if $(PRIORITY), echo "Target-Profile-Priority: $(PRIORITY)"; ) \
 	echo "Target-Profile-Name: $(NAME)"; \
 	echo "Target-Profile-Packages: $(PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES))"; \
-	if [ -f ./config/profile-$(1) ]; then \
-		echo "Target-Profile-Kconfig: yes"; \
-	fi; \
-	echo "Target-Profile-Config: "; \
-	echo "$$$$$$$$$(call shvar,Profile/$(1)/Config)"; \
-	echo "@@"; \
 	echo "Target-Profile-Description:"; \
 	echo "$$$$$$$$$(call shvar,Profile/$(1)/Description)"; \
 	echo "@@"; \
 	echo;
-  ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_))$(1)),y)
-    PROFILE=$(1)
-  endif
 endef
 endif

@@ -98,10 +91,10 @@ else
  endef
 endif

+PROFILE?=$(call qstrip,$(CONFIG_TARGET_PROFILE))
+
 ifeq ($(TARGET_BUILD),1)
-  $(eval $(call IncludeProfiles))
-else
-  ifeq ($(DUMP),)
+  ifneq ($(DUMP),)
    $(eval $(call IncludeProfiles))
  endif
 endif
@@ -162,6 +155,71 @@ LINUX_RECONF_DIFF = $(call __linux_confcmd,$(filter-out $(LINUX_RECONFIG_TARGET)
 ifeq ($(DUMP),1)
  BuildTarget=$(BuildTargets/DumpCurrent)

+  CPU_CFLAGS = -Os -pipe
+  ifneq ($(findstring mips,$(ARCH)),)
+    ifneq ($(findstring mips64,$(ARCH)),)
+      CPU_TYPE ?= mips64
+    else
+      CPU_TYPE ?= mips32
+    endif
+    CPU_CFLAGS += -mno-branch-likely
+    CPU_CFLAGS_mips32 = -mips32 -mtune=mips32
+    CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64
+    CPU_CFLAGS_24kc = -mips32r2 -mtune=24kc
+    CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc
+    CPU_CFLAGS_octeon = -march=octeon -mabi=64
+  endif
+  ifeq ($(ARCH),i386)
+    CPU_TYPE ?= pentium
+    CPU_CFLAGS_pentium = -march=pentium-mmx
+    CPU_CFLAGS_pentium4 = -march=pentium4
+  endif
+  ifneq ($(findstring arm,$(ARCH)),)
+    CPU_TYPE ?= xscale
+    CPU_CFLAGS_arm920t = -mcpu=arm920t
+    CPU_CFLAGS_arm926ej-s = -mcpu=arm926ej-s
+    CPU_CFLAGS_arm1136j-s = -mcpu=arm1136j-s
+    CPU_CFLAGS_arm1176jzf-s = -mcpu=arm1176jzf-s
+    CPU_CFLAGS_cortex-a5 = -mcpu=cortex-a5
+    CPU_CFLAGS_cortex-a7 = -mcpu=cortex-a7
+    CPU_CFLAGS_cortex-a8 = -mcpu=cortex-a8
+    CPU_CFLAGS_cortex-a9 = -mcpu=cortex-a9
+    CPU_CFLAGS_cortex-a15 = -mcpu=cortex-a15
+    CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53
+    CPU_CFLAGS_fa526 = -mcpu=fa526
+    CPU_CFLAGS_mpcore = -mcpu=mpcore
+    CPU_CFLAGS_xscale = -mcpu=xscale
+    ifeq ($(CONFIG_SOFT_FLOAT),)
+      CPU_CFLAGS_neon = -mfpu=neon
+      CPU_CFLAGS_vfp = -mfpu=vfp
+      CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16
+      CPU_CFLAGS_neon-vfpv4 = -mfpu=neon-vfpv4
+    endif
+  endif
+  ifeq ($(ARCH),powerpc)
+    CPU_CFLAGS_603e:=-mcpu=603e
+    CPU_CFLAGS_8540:=-mcpu=8540
+    CPU_CFLAGS_405:=-mcpu=405
+    CPU_CFLAGS_440:=-mcpu=440
+    CPU_CFLAGS_464fp:=-mcpu=464fp
+  endif
+  ifeq ($(ARCH),sparc)
+    CPU_TYPE = sparc
+    CPU_CFLAGS_ultrasparc = -mcpu=ultrasparc
+  endif
+  ifeq ($(ARCH),aarch64)
+    CPU_TYPE ?= armv8-a
+    CPU_CFLAGS_armv8-a = -mcpu=armv8-a
+    CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53
+  endif
+  ifeq ($(ARCH),arc)
+    CPU_TYPE ?= arc700
+    CPU_CFLAGS += -matomic
+    CPU_CFLAGS_arc700 = -marc700
+    CPU_CFLAGS_archs = -marchs
+  endif
+  DEFAULT_CFLAGS=$(strip $(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE)) $(CPU_CFLAGS_$(CPU_SUBTYPE)))
+
  ifneq ($(BOARD),)
    TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(call target_conf,$(TARGETID))
    $(TMP_CONFIG): $(LINUX_KCONFIG_LIST)
@@ -196,79 +254,22 @@ ifeq ($(DUMP),1)
    ifneq ($(CONFIG_RTC_CLASS),)
      FEATURES += rtc
    endif
-    FEATURES += $(foreach v,v4 v5 v6 v7,$(if $(findstring -march=arm$(v),$(CFLAGS)),arm_$(v)))
+    ifneq ($(CONFIG_VIRTIO),)
+      FEATURES += virtio
+    endif
+    ifneq ($(CONFIG_CPU_MIPS32_R2),)
+      FEATURES += mips16
+    endif
+    FEATURES += $(foreach v,6 7,$(if $(CONFIG_CPU_V$(v)),arm_v$(v)))

    # remove duplicates
    FEATURES:=$(sort $(FEATURES))
  endif
-  CPU_CFLAGS = -Os -pipe
-  ifneq ($(findstring mips,$(ARCH)),)
-    ifneq ($(findstring mips64,$(ARCH)),)
-      CPU_TYPE ?= mips64
-    else
-      CPU_TYPE ?= mips32
-    endif
-    CPU_CFLAGS += -mno-branch-likely
-    CPU_CFLAGS_mips32 = -mips32 -mtune=mips32
-    CPU_CFLAGS_mips32r2 = -mips32r2 -mtune=mips32r2
-    CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64
-    CPU_CFLAGS_24kc = -mips32r2 -mtune=24kc
-    CPU_CFLAGS_24kec = -mips32r2 -mtune=24kec
-    CPU_CFLAGS_34kc = -mips32r2 -mtune=34kc
-    CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc
-    CPU_CFLAGS_octeon = -march=octeon -mabi=64
-    CPU_CFLAGS_dsp = -mdsp
-    CPU_CFLAGS_dsp2 = -mdspr2
-  endif
-  ifeq ($(ARCH),i386)
-    CPU_TYPE ?= i486
-    CPU_CFLAGS_i486 = -march=i486
-    CPU_CFLAGS_pentium4 = -march=pentium4
-    CPU_CFLAGS_geode = -march=geode -mmmx -m3dnow
-  endif
-  ifneq ($(findstring arm,$(ARCH)),)
-    CPU_TYPE ?= xscale
-    CPU_CFLAGS_arm920t = -march=armv4t -mtune=arm920t
-    CPU_CFLAGS_arm926ej-s = -march=armv5te -mtune=arm926ej-s
-    CPU_CFLAGS_arm1136j-s = -march=armv6 -mtune=arm1136j-s
-    CPU_CFLAGS_arm1176jzf-s = -march=armv6 -mtune=arm1176jzf-s
-    CPU_CFLAGS_cortex-a5 = -march=armv7-a -mtune=cortex-a5
-    CPU_CFLAGS_cortex-a7 = -march=armv7-a -mtune=cortex-a7
-    CPU_CFLAGS_cortex-a8 = -march=armv7-a -mtune=cortex-a8
-    CPU_CFLAGS_cortex-a9 = -march=armv7-a -mtune=cortex-a9
-    CPU_CFLAGS_cortex-a15 = -march=armv7-a -mtune=cortex-a15
-    CPU_CFLAGS_cortex-a53 = -march=armv8-a -mtune=cortex-a53
-    CPU_CFLAGS_fa526 = -march=armv4 -mtune=fa526
-    CPU_CFLAGS_mpcore = -march=armv6k -mtune=mpcore
-    CPU_CFLAGS_xscale = -march=armv5te -mtune=xscale
-    ifeq ($(CONFIG_SOFT_FLOAT),)
-      CPU_CFLAGS_neon = -mfpu=neon
-      CPU_CFLAGS_vfp = -mfpu=vfp
-      CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16
-      CPU_CFLAGS_neon-vfpv4 = -mfpu=neon-vfpv4
-    endif
-  endif
-  ifeq ($(ARCH),powerpc)
-    CPU_CFLAGS_603e:=-mcpu=603e
-    CPU_CFLAGS_8540:=-mcpu=8540
-    CPU_CFLAGS_405:=-mcpu=405
-    CPU_CFLAGS_440:=-mcpu=440
-  endif
-  ifeq ($(ARCH),sparc)
-    CPU_TYPE = sparc
-    CPU_CFLAGS_ultrasparc = -mcpu=ultrasparc
-  endif
-  ifeq ($(ARCH),aarch64)
-    CPU_TYPE ?= armv8-a
-    CPU_CFLAGS_armv8-a = -mcpu=armv8-a
-  endif
-  ifeq ($(ARCH),arc)
-    CPU_TYPE ?= arc700
-    CPU_CFLAGS += -matomic
-    CPU_CFLAGS_arc700 = -marc700
-    CPU_CFLAGS_archs = -marchs
-  endif
-  DEFAULT_CFLAGS=$(strip $(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE)) $(CPU_CFLAGS_$(CPU_SUBTYPE)))
+endif
+
+CUR_SUBTARGET:=$(SUBTARGET)
+ifeq ($(SUBTARGETS),)
+  CUR_SUBTARGET := default
 endif

 define BuildTargets/DumpCurrent
@@ -278,9 +279,8 @@ define BuildTargets/DumpCurrent
 	@echo 'Target: $(TARGETID)'; \
 	 echo 'Target-Board: $(BOARD)'; \
 	 echo 'Target-Name: $(BOARDNAME)$(if $(SUBTARGETS),$(if $(SUBTARGET),))'; \
-	 echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))'; \
 	 echo 'Target-Arch: $(ARCH)'; \
-	 echo 'Target-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD))'; \
+	 echo 'Target-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(ARCH)$(if $(CPU_TYPE),_$(CPU_TYPE))$(if $(CPU_SUBTYPE),_$(CPU_SUBTYPE)))'; \
 	 echo 'Target-Features: $(FEATURES)'; \
 	 echo 'Target-Depends: $(DEPENDS)'; \
 	 echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \
@@ -294,6 +294,7 @@ define BuildTargets/DumpCurrent
 	 echo '@@'; \
 	 echo 'Default-Packages: $(DEFAULT_PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES))'; \
 	 $(DUMPINFO)
+	$(if $(CUR_SUBTARGET),$(SUBMAKE) -r --no-print-directory -C image -s DUMP=1 SUBTARGET=$(CUR_SUBTARGET))
 	$(if $(SUBTARGET),,@$(foreach SUBTARGET,$(SUBTARGETS),$(SUBMAKE) -s DUMP=1 SUBTARGET=$(SUBTARGET); ))
 endef

--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -6,7 +6,6 @@
 # See /LICENSE for more information.
 #

-RELEASE:=Designated Driver
 PREP_MK= OPENWRT_BUILD= QUIET=0

 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
@@ -17,14 +16,15 @@ ifeq ($(SDK),1)
  include $(TOPDIR)/include/version.mk
 else
  REVISION:=$(shell $(TOPDIR)/scripts/getver.sh)
+  SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh)
 endif

 HOSTCC ?= $(CC)
-export RELEASE
 export REVISION
+export SOURCE_DATE_EPOCH
 export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
+export GIT_ASKPASS:=/bin/true
 export MAKE_JOBSERVER=$(filter --jobserver%,$(MAKEFLAGS))
-export SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh)

 # prevent perforce from messing with the patch utility
 unexport P4PORT P4USER P4CONFIG P4CLIENT
@@ -68,7 +68,7 @@ SUBMAKE:=umask 022; $(SUBMAKE)

 ULIMIT_FIX=_limit=`ulimit -n`; [ "$$_limit" = "unlimited" -o "$$_limit" -ge 1024 ] || ulimit -n 1024;

-prepare-mk: FORCE ;
+prepare-mk: staging_dir/host/.prereq-build FORCE ;

 ifdef SDK
  IGNORE_PACKAGES = linux
@@ -80,14 +80,14 @@ prepare-tmpinfo: FORCE
 	@+$(MAKE) -r -s staging_dir/host/.prereq-build $(PREP_MK)
 	mkdir -p tmp/info
 	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk $(TOPDIR)/overlay/*/*.mk" SCAN_DEPTH=5 SCAN_EXTRA=""
-	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
+	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="image/Makefile profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
 	for type in package target; do \
 		f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \
-		[ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $(_ignore) $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
+		[ "$$t" -nt "$$f" ] || ./scripts/$${type}-metadata.pl $(_ignore) config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
 	done
 	[ tmp/.config-feeds.in -nt tmp/.packagesubdirs ] || ./scripts/feeds feed_config > tmp/.config-feeds.in
-	./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
-	./scripts/metadata.pl package_subdirs tmp/.packageinfo > tmp/.packagesubdirs || { rm -f tmp/.packagesubdirs; false; }
+	./scripts/package-metadata.pl mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
+	./scripts/package-metadata.pl subdirs tmp/.packageinfo > tmp/.packagesubdirs || { rm -f tmp/.packagesubdirs; false; }
 	touch $(TOPDIR)/tmp/.build

 .config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo)
@@ -112,7 +112,7 @@ config-clean: FORCE

 defconfig: scripts/config/conf prepare-tmpinfo FORCE
 	touch .config
-	@if [ -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi
+	@if [ ! -s .config -a -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi
 	$< --defconfig=.config Config.in

 confdefault-y=allyes
@@ -127,7 +127,7 @@ menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
 	if [ \! -e .config -a -e $(HOME)/.openwrt/defconfig ]; then \
 		cp $(HOME)/.openwrt/defconfig .config; \
 	fi
-	$< Config.in
+	[ -L .config ] && export KCONFIG_OVERWRITECONFIG=1; $< Config.in

 prepare_kernel_conf: .config FORCE

@@ -165,11 +165,14 @@ staging_dir/host/.prereq-build: include/prereq-build.mk
 printdb: FORCE
 	@$(_SINGLE)$(NO_TRACE_MAKE) -p $@ V=99 DUMP_TARGET_DB=1 2>&1

-download: .config FORCE
-	@+$(SUBMAKE) tools/download
-	@+$(SUBMAKE) toolchain/download
-	@+$(SUBMAKE) package/download
-	@+$(SUBMAKE) target/download
+ifndef SDK
+  DOWNLOAD_DIRS = tools/download toolchain/download package/download target/download
+else
+  DOWNLOAD_DIRS = package/download
+endif
+
+download: .config FORCE $(if $(wildcard $(TOPDIR)/staging_dir/host/bin/flock),,tools/flock/compile)
+	@+$(foreach dir,$(DOWNLOAD_DIRS),$(SUBMAKE) $(dir);)

 clean dirclean: .config
 	@+$(SUBMAKE) -r $@
@@ -177,6 +180,9 @@ clean dirclean: .config
 prereq:: prepare-tmpinfo .config
 	@+$(NO_TRACE_MAKE) -r -s $@

+check: .config FORCE
+	@+$(NO_TRACE_MAKE) -r -s $@ QUIET= V=s
+
 WARN_PARALLEL_ERROR = $(if $(BUILD_LOG),,$(and $(filter -j,$(MAKEFLAGS)),$(findstring s,$(OPENWRT_VERBOSE))))

 ifeq ($(SDK),1)
@@ -221,12 +227,6 @@ package/symlinks-clean:
 help:
 	cat README

-docs docs/compile: FORCE
-	@$(_SINGLE)$(SUBMAKE) -C docs compile
-
-docs/clean: FORCE
-	@$(_SINGLE)$(SUBMAKE) -C docs clean
-
 distclean:
 	rm -rf bin build_dir .config* dl feeds key-build* logs package/feeds package/openwrt-packages staging_dir tmp
 	@$(_SINGLE)$(SUBMAKE) -C scripts/config clean
--- a/include/unpack.mk
+++ b/include/unpack.mk
@@ -5,14 +5,9 @@
 # See /LICENSE for more information.
 #

-# unpacking files with +s may break on some platforms. this typically emits error code 2
-ifneq ($(HOST_OS),Linux)
-  HOST_TAR:=trapret 2 $(TAR)
-else
-  HOST_TAR:=$(TAR)
-endif
+HOST_TAR:=$(TAR)
 TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS)
-UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE)
+UNZIP_CMD=unzip -q -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE)

 ifeq ($(PKG_SOURCE),)
  PKG_UNPACK ?= true
--- a/include/version.mk
+++ b/include/version.mk
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2012-2015 OpenWrt.org
+# Copyright (C) 2016 LEDE Project
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,40 +8,55 @@

 # Substituted by SDK, do not remove
 # REVISION:=x
+# SOURCE_DATE_EPOCH:=x
+
+RELEASE:=Reboot

 PKG_CONFIG_DEPENDS += \
+	CONFIG_VERSION_BUG_URL \
 	CONFIG_VERSION_NUMBER \
+	CONFIG_VERSION_CODE \
 	CONFIG_VERSION_NICK \
 	CONFIG_VERSION_REPO \
 	CONFIG_VERSION_DIST \
 	CONFIG_VERSION_MANUFACTURER \
 	CONFIG_VERSION_MANUFACTURER_URL \
 	CONFIG_VERSION_PRODUCT \
+	CONFIG_VERSION_SUPPORT_URL \
 	CONFIG_VERSION_HWREV \

 qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
 #'

-VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION))
+sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))

-VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Bleeding Edge)
+VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),17.01.3)
+
+VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r3533-d0bf257c46)

 VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK))
 VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE))

 VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots/trunk/%S/packages)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/releases/17.01.3)

 VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
-VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
+VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE)
+VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))

 VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
-VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt)
+VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE)

 VERSION_MANUFACTURER_URL:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER_URL))
-VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://www.openwrt.org/)
+VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://lede-project.org/)
+
+VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL))
+VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.lede-project.org/)
+
+VERSION_SUPPORT_URL:=$(call qstrip_escape,$(CONFIG_VERSION_SUPPORT_URL))
+VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)

 VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
 VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
@@ -84,9 +100,12 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
 	-e 's,%R,$(REVISION),g' \
 	-e 's,%T,$(BOARD),g' \
 	-e 's,%S,$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic),g' \
+	-e 's,%A,$(ARCH_PACKAGES),g' \
 	-e 's,%t,$(VERSION_TAINTS),g' \
 	-e 's,%M,$(VERSION_MANUFACTURER),g' \
 	-e 's,%m,$(VERSION_MANUFACTURER_URL),g' \
+	-e 's,%b,$(VERSION_BUG_URL),g' \
+	-e 's,%s,$(VERSION_SUPPORT_URL),g' \
 	-e 's,%P,$(VERSION_PRODUCT),g' \
 	-e 's,%h,$(VERSION_HWREV),g'

--- a/package/Makefile
+++ b/package/Makefile
@@ -7,13 +7,17 @@

 curdir:=package

-include $(INCLUDE_DIR)/feeds.mk
+include $(INCLUDE_DIR)/rootfs.mk

 -include $(TMP_DIR)/.packagedeps
 $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
 $(curdir)/builddirs-install:=.
 $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
 $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
+ifdef CHECK_ALL
+$(curdir)/builddirs-check:=$($(curdir)/builddirs)
+$(curdir)/builddirs-download:=$($(curdir)/builddirs)
+endif
 ifneq ($(IGNORE_ERRORS),)
  package-y-filter := $(package-y)
  package-m-filter := $(filter-out $(package-y),$(package-m))
@@ -27,56 +31,6 @@ ifneq ($(IGNORE_ERRORS),)
  $(curdir)/builddirs-ignore-host-compile := $(package-ignore-subdirs)
 endif

-ifdef CONFIG_USE_MKLIBS
-  define mklibs
-	rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out
-	# first find all programs and add them to the mklibs list
-	find $(STAGING_DIR_ROOT) -type f -perm /100 -exec \
-		file -r -N -F '' {} + | \
-		awk ' /executable.*dynamically/ { print $$1 }' > $(TMP_DIR)/mklibs-progs
-	# find all loadable objects that are not regular libraries and add them to the list as well
-	find $(STAGING_DIR_ROOT) -type f -name \*.so\* -exec \
-		file -r -N -F '' {} + | \
-		awk ' /shared object/ { print $$1 }' > $(TMP_DIR)/mklibs-libs
-	mkdir -p $(TMP_DIR)/mklibs-out
-	$(STAGING_DIR_HOST)/bin/mklibs -D \
-		-d $(TMP_DIR)/mklibs-out \
-		--sysroot $(STAGING_DIR_ROOT) \
-		`cat $(TMP_DIR)/mklibs-libs | sed 's:/*[^/]\+/*$$::' | uniq | sed 's:^$(STAGING_DIR_ROOT):-L :'` \
-		--ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \
-			$(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so ld-musl-*.so.*, \
-			  $(STAGING_DIR_ROOT)/lib/$(name) \
-			)))) \
-		--target $(REAL_GNU_TARGET_NAME) \
-		`cat $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-libs` 2>&1
-	$(RSTRIP) $(TMP_DIR)/mklibs-out
-	for lib in `ls $(TMP_DIR)/mklibs-out/*.so.* 2>/dev/null`; do \
-		LIB="$${lib##*/}"; \
-		DEST="`ls "$(TARGET_DIR)/lib/$$LIB" "$(TARGET_DIR)/usr/lib/$$LIB" 2>/dev/null`"; \
-		[ -n "$$DEST" ] || continue; \
-		echo "Copying stripped library $$lib to $$DEST"; \
-		cp "$$lib" "$$DEST" || exit 1; \
-	done
-  endef
-endif
-
-# where to build (and put) .ipk packages
-OPKG:= \
-  IPKG_NO_SCRIPT=1 \
-  IPKG_TMP=$(TMP_DIR)/ipkg \
-  IPKG_INSTROOT=$(TARGET_DIR) \
-  IPKG_CONF_DIR=$(STAGING_DIR)/etc \
-  IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
-  $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \
-	--offline-root $(TARGET_DIR) \
-	--force-depends \
-	--force-overwrite \
-	--force-postinstall \
-	--force-maintainer \
-	--add-dest root:/ \
-	--add-arch all:100 \
-	--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
-
 PACKAGE_INSTALL_FILES:= \
 	$(foreach pkg,$(sort $(package-y)), \
 		$(foreach variant, \
@@ -94,94 +48,48 @@ PACKAGE_INSTALL_FILES:= \
 $(curdir)/cleanup: $(TMP_DIR)/.build
 	rm -rf $(STAGING_DIR_ROOT)

-$(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install
+$(curdir)/merge:
+	rm -rf $(PACKAGE_DIR_ALL)
+	mkdir -p $(PACKAGE_DIR_ALL)
+	-$(foreach pdir,$(PACKAGE_SUBDIRS),$(if $(wildcard $(pdir)/*.ipk),ln -s $(pdir)/*.ipk $(PACKAGE_DIR_ALL);))
+
+$(curdir)/merge-index: $(curdir)/merge
+	(cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; )
+
+$(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/compile $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index)
 	- find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
-	rm -rf $(TARGET_DIR)
+	rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
 	[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
-	@$(FIND) `sed -e 's|.*|$(PACKAGE_DIR)$(if $(CONFIG_PER_FEED_REPO),/*)/&_*.ipk|' $(PACKAGE_INSTALL_FILES)` | sort -u | $(OPKG) install
+	$(call opkg,$(TARGET_DIR)) install \
+		$(call opkg_package_files,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null))
 	@for file in $(PACKAGE_INSTALL_FILES); do \
 		[ -s $$file.flags ] || continue; \
 		for flag in `cat $$file.flags`; do \
-			$(OPKG) flag $$flag < $$file; \
+			$(call opkg,$(TARGET_DIR)) flag $$flag `cat $$file`; \
 		done; \
 	done || true
 	@-$(MAKE) package/preconfig
-	@if [ -d $(TOPDIR)/files ]; then \
-		$(call file_copy,$(TOPDIR)/files/.,$(TARGET_DIR)); \
-	fi
-	@mkdir -p $(TARGET_DIR)/etc/rc.d
-	@( \
-		cd $(TARGET_DIR); \
-		for script in ./usr/lib/opkg/info/*.postinst; do \
-			IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) $$script; \
-		done; \
-		for script in ./etc/init.d/*; do \
-			grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
-			IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) ./etc/rc.common $$script enable; \
-		done || true \
-	)
-	$(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(TARGET_DIR)/usr/lib/opkg/status)
-	@-find $(TARGET_DIR) -name CVS   | $(XARGS) rm -rf
-	@-find $(TARGET_DIR) -name .svn  | $(XARGS) rm -rf
-	@-find $(TARGET_DIR) -name .git  | $(XARGS) rm -rf
-	@-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f
-	rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst*
-	rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.prerm*
-	$(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
-	$(call mklibs)

-PASSOPT=""
-PASSARG=""
-ifndef CONFIG_OPKGSMIME_PASSPHRASE
-  ifneq ($(call qstrip,$(CONFIG_OPKGSMIME_PASSFILE)),)
-    PASSOPT="-passin"
-    PASSARG="file:$(call qstrip,$(CONFIG_OPKGSMIME_PASSFILE))"
-  endif
-endif
+	$(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG)

-PACKAGE_SUBDIRS=.
-ifneq ($(CONFIG_PER_FEED_REPO),)
-  ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),)
-    PACKAGE_SUBDIRS=base kernel $(FEEDS_AVAILABLE)
-  else
-    PACKAGE_SUBDIRS=base kernel $(FEEDS_ENABLED)
-  endif
-endif
+	$(call prepare_rootfs,$(TARGET_DIR))

 $(curdir)/index: FORCE
 	@echo Generating package index...
 	@for d in $(PACKAGE_SUBDIRS); do ( \
-		mkdir -p $(PACKAGE_DIR)/$$d; \
-		cd $(PACKAGE_DIR)/$$d || continue; \
-		$(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \
+		mkdir -p $$d; \
+		cd $$d || continue; \
+		$(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages.manifest; \
+		grep -vE '^(Maintainer|LicenseFiles|Source|Require)' Packages.manifest > Packages && \
 			gzip -9nc Packages > Packages.gz; \
 	); done
 ifdef CONFIG_SIGNED_PACKAGES
 	@echo Signing package index...
 	@for d in $(PACKAGE_SUBDIRS); do ( \
-		[ -d $(PACKAGE_DIR)/$$d ] && \
-			cd $(PACKAGE_DIR)/$$d || continue; \
+		[ -d $$d ] && \
+			cd $$d || continue; \
 		$(STAGING_DIR_HOST)/bin/usign -S -m Packages -s $(BUILD_KEY); \
 	); done
-else
-ifeq ($(call qstrip,$(CONFIG_OPKGSMIME_KEY)),)
-	@echo Signing key has not been configured
-else
-ifeq ($(call qstrip,$(CONFIG_OPKGSMIME_CERT)),)
-	@echo Certificate has not been configured
-else
-	@echo Signing package index...
-	@for d in $(PACKAGE_SUBDIRS); do ( \
-		[ -d $(PACKAGE_DIR)/$$d ] && \
-			cd $(PACKAGE_DIR)/$$d || continue; \
-		openssl smime -binary -in Packages.gz \
-			-out Packages.sig -outform PEM -sign \
-			-signer $(CONFIG_OPKGSMIME_CERT) \
-			-inkey $(CONFIG_OPKGSMIME_KEY) \
-			$(PASSOPT) $(PASSARG); \
-	); done
-endif
-endif
 endif

 $(curdir)/preconfig:
@@ -192,5 +100,6 @@ $(eval $(call stampfile,$(curdir),package,prereq,.config))
 $(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),package,check,$(TMP_DIR)/.build))

 $(eval $(call subdir,$(curdir)))
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,29 +11,28 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk

 PKG_NAME:=base-files
-PKG_RELEASE:=168
+PKG_RELEASE:=173.1
+PKG_FLAGS:=nonshared

 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=usign/host
 PKG_LICENSE:=GPL-2.0

-PKG_CONFIG_DEPENDS := CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH
+# Extend depends from version.mk
+PKG_CONFIG_DEPENDS += CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE

 include $(INCLUDE_DIR)/package.mk

 ifneq ($(DUMP),1)
-  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell $(SH_FUNC) echo $(CONFIG_TARGET_INIT_PATH) | md5s)
+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(CONFIG_TARGET_INIT_PATH) | mkhash md5)
  TARGET:=-$(BOARD)
-  ifneq ($(wildcard $(PLATFORM_DIR)/base-files-$(PROFILE) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)),)
-    TARGET:=$(TARGET)-$(PROFILE)
-  endif
 endif

 define Package/base-files
  SECTION:=base
  CATEGORY:=Base system
-  DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +fstools
-  TITLE:=Base filesystem for OpenWrt
+  DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:lede-keyring +fstools +fwtool
+  TITLE:=Base filesystem for Lede
  URL:=http://openwrt.org/
  VERSION:=$(PKG_RELEASE)-$(REVISION)
 endef
@@ -59,6 +58,7 @@ define Package/base-files/conffiles
 /etc/sysctl.d/local.conf
 /etc/sysctl.d/
 /etc/iproute2/rt_tables
+/etc/iproute2/rt_protos
 $(call $(TARGET)/conffiles)
 endef

@@ -66,7 +66,6 @@ define Package/base-files/description
 This package contains a base filesystem and system scripts for OpenWrt.
 endef

-ifneq ($(CONFIG_PREINITOPT),)
 define ImageConfigOptions
 	mkdir -p $(1)/lib/preinit
 	echo 'pi_suppress_stderr="$(CONFIG_TARGET_PREINIT_SUPPRESS_STDERR)"' >$(1)/lib/preinit/00_preinit.conf
@@ -81,8 +80,8 @@ define ImageConfigOptions
 	echo 'pi_broadcast=$(if $(CONFIG_TARGET_PREINIT_BROADCAST),$(CONFIG_TARGET_PREINIT_BROADCAST),"192.168.1.255")' >>$(1)/lib/preinit/00_preinit.conf
 	echo 'pi_preinit_net_messages="$(CONFIG_TARGET_PREINIT_SHOW_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf
 	echo 'pi_preinit_no_failsafe_netmsg="$(CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_preinit_no_failsafe="$(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE)"' >>$(1)/lib/preinit/00_preinit.conf
 endef
-endif

 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
@@ -116,31 +115,21 @@ define Package/base-files/install
 	if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
 		$(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \
 	fi
-	if [ -d $(PLATFORM_DIR)/base-files-$(PROFILE)/. ]; then \
-		$(CP) $(PLATFORM_DIR)/base-files-$(PROFILE)/* $(1)/; \
-	fi
-	if [ -d $(PLATFORM_DIR)/$(PROFILE)/base-files/. ]; then \
-		$(CP) $(PLATFORM_DIR)/$(PROFILE)/base-files/* $(1)/; \
-	fi
 	$(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \
 		if [ -d $(PLATFORM_SUBDIR)/base-files/. ]; then \
 			$(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \
 		fi; \
-		if [ -d $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/. ]; then \
-			$(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
-		fi; \
-		if [ -d $(PLATFORM_SUBDIR)/$(PROFILE)/base-files/. ]; then \
-			$(CP) $(PLATFORM_SUBDIR)/$(PROFILE)/base-files/* $(1)/; \
-		fi \
 	)

 	$(VERSION_SED) \
 		$(1)/etc/banner \
-		$(1)/etc/openwrt_version
+		$(1)/etc/openwrt_version \
+		$(1)/usr/lib/os-release

 	$(VERSION_SED_SCRIPT) \
 		$(1)/etc/openwrt_release \
-		$(1)/etc/device_info
+		$(1)/etc/device_info \
+		$(1)/usr/lib/os-release

 	$(SED) "s#%PATH%#$(TARGET_INIT_PATH)#g" \
 		$(1)/sbin/hotplug-call \
@@ -149,6 +138,7 @@ define Package/base-files/install

 	mkdir -p $(1)/CONTROL
 	mkdir -p $(1)/dev
+	mkdir -p $(1)/etc/config
 	mkdir -p $(1)/etc/crontabs
 	mkdir -p $(1)/etc/rc.d
 	mkdir -p $(1)/overlay
@@ -167,7 +157,7 @@ define Package/base-files/install
 	rm -f $(1)/var
 	$(LN) /tmp $(1)/var
 	mkdir -p $(1)/etc
-	$(LN) /tmp/resolv.conf /tmp/fstab /tmp/TZ /tmp/localtime $(1)/etc/
+	$(LN) /tmp/resolv.conf /tmp/TZ /tmp/localtime $(1)/etc/

 	chmod 0600 $(1)/etc/shadow
 	chmod 1777 $(1)/tmp
@@ -184,6 +174,7 @@ endef

 ifneq ($(DUMP),1)
  -include $(PLATFORM_DIR)/base-files.mk
+  -include $(PLATFORM_SUBDIR)/base-files.mk
 endif

 $(eval $(call BuildPackage,base-files))
--- a/package/base-files/files/bin/board_detect
+++ b/package/base-files/files/bin/board_detect
@@ -1,14 +1,14 @@
 #!/bin/sh

-[ -d "/etc/board.d/" -a ! -f "/etc/board.json" ] && {
+CFG=$1
+
+[ -n "$CFG" ] || CFG=/etc/board.json
+
+[ -d "/etc/board.d/" -a ! -s "$CFG" ] && {
 	for a in `ls /etc/board.d/*`; do
 		[ -x $a ] || continue;
 		$(. $a)
 	done
 }

-[ -f "/etc/board.json" ] || return 1
-[ -f "/etc/config/network" ] || {
-	touch /etc/config/network
-	/bin/config_generate
-}
+[ -s "$CFG" ] || return 1
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -4,7 +4,8 @@ CFG=/etc/board.json

 . /usr/share/libubox/jshn.sh

-[ -f $CFG ] || exit 1
+[ -s $CFG ] || /bin/board_detect || exit 1
+[ -s /etc/config/network -a -s /etc/config/system ] && exit 0

 generate_static_network() {
 	uci -q batch <<-EOF
@@ -118,17 +119,14 @@ generate_network() {
 		;;

 		pppoe)
-			# fixup IPv6 slave interface
-			ifname="pppoe-$1"
-
 			uci -q batch <<-EOF
 				set network.$1.proto='pppoe'
 				set network.$1.username='username'
 				set network.$1.password='password'
-				set network.$1.ipv6='auto'
+				set network.$1.ipv6='1'
 				delete network.${1}6
 				set network.${1}6='interface'
-				set network.${1}6.ifname='$ifname'
+				set network.${1}6.ifname='@${1}'
 				set network.${1}6.proto='dhcpv6'
 			EOF
 		;;
@@ -143,55 +141,59 @@ generate_switch_vlans_ports() {
 	# autogenerate vlans
 	#

-	json_get_keys roles roles
-	json_select roles
+	if json_is_a roles array; then
+		json_get_keys roles roles
+		json_select roles
+
+		for role in $roles; do
+			json_select "$role"
+				json_get_vars ports
+			json_select ..
+
+			uci -q batch <<-EOF
+				add network switch_vlan
+				set network.@switch_vlan[-1].device='$switch'
+				set network.@switch_vlan[-1].vlan='$role'
+				set network.@switch_vlan[-1].ports='$ports'
+			EOF
+		done

-	for role in $roles; do
-		json_select "$role"
-			json_get_vars ports
 		json_select ..
-
-		uci -q batch <<-EOF
-			add network switch_vlan
-			set network.@switch_vlan[-1].device='$switch'
-			set network.@switch_vlan[-1].vlan='$role'
-			set network.@switch_vlan[-1].ports='$ports'
-		EOF
-	done
-
-	json_select ..
+	fi


 	#
 	# write port specific settings
 	#

-	json_get_keys ports ports
-	json_select ports
+	if json_is_a ports array; then
+		json_get_keys ports ports
+		json_select ports

-	for port in $ports; do
-		json_select "$port"
-			json_get_vars num
+		for port in $ports; do
+			json_select "$port"
+				json_get_vars num

-			if json_is_a attr object; then
-				json_get_keys attr attr
-				json_select attr
-					uci -q batch <<-EOF
-						add network switch_port
-						set network.@switch_port[-1].device='$switch'
-						set network.@switch_port[-1].port=$num
-					EOF
+				if json_is_a attr object; then
+					json_get_keys attr attr
+					json_select attr
+						uci -q batch <<-EOF
+							add network switch_port
+							set network.@switch_port[-1].device='$switch'
+							set network.@switch_port[-1].port=$num
+						EOF
+
+						for attr in $attr; do
+							json_get_var val "$attr"
+							uci -q set network.@switch_port[-1].$attr="$val"
+						done
+					json_select ..
+				fi
+			json_select ..
+		done

-					for attr in $attr; do
-						json_get_var val "$attr"
-						uci -q set network.@switch_port[-1].$attr="$val"
-					done
-				json_select ..
-			fi
 		json_select ..
-	done
-
-	json_select ..
+	fi
 }

 generate_switch() {
@@ -216,6 +218,52 @@ generate_switch() {
 	json_select ..
 }

+
+generate_static_system() {
+	uci -q batch <<-EOF
+		delete system.@system[0]
+		add system system
+		set system.@system[-1].hostname='LEDE'
+		set system.@system[-1].timezone='UTC'
+		set system.@system[-1].ttylogin='0'
+		set system.@system[-1].log_size='64'
+		set system.@system[-1].urandom_seed='0'
+
+		delete system.ntp
+		set system.ntp='timeserver'
+		set system.ntp.enabled='1'
+		set system.ntp.enable_server='0'
+		add_list system.ntp.server='0.lede.pool.ntp.org'
+		add_list system.ntp.server='1.lede.pool.ntp.org'
+		add_list system.ntp.server='2.lede.pool.ntp.org'
+		add_list system.ntp.server='3.lede.pool.ntp.org'
+	EOF
+
+	if json_is_a system object; then
+		json_select system
+			local hostname
+			if json_get_var hostname hostname; then
+				uci -q set "system.@system[-1].hostname=$hostname"
+			fi
+
+			if json_is_a ntpserver array; then
+				local keys key
+				json_get_keys keys ntpserver
+				json_select ntpserver
+					uci -q delete "system.ntp.server"
+
+					for key in $keys; do
+						local server
+						if json_get_var server "$key"; then
+							uci -q add_list "system.ntp.server=$server"
+						fi
+					done
+				json_select ..
+			fi
+		json_select ..
+	fi
+}
+
 generate_rssimon() {
 	local key="$1"
 	local cfg="rssid_$key"
@@ -284,6 +332,15 @@ generate_led() {
 			EOF
 		;;

+		usbport)
+			local ports port
+			json_get_values ports ports
+			uci set system.$cfg.trigger='usbport'
+			for port in $ports; do
+				uci add_list system.$cfg.port=$port
+			done
+		;;
+
 		rssi)
 			local iface minq maxq offset factor
 			json_get_vars iface minq maxq offset factor
@@ -306,6 +363,14 @@ generate_led() {
 			EOF
 		;;

+		portstate)
+			local port_state
+			json_get_vars port_state
+			uci -q batch <<-EOF
+				set system.$cfg.port_state='$port_state'
+			EOF
+		;;
+
 		timer|oneshot)
 			local delayon delayoff
 			json_get_vars delayon delayoff
@@ -333,7 +398,7 @@ generate_gpioswitch() {
 				set system.$cfg='gpio_switch'
 				set system.$cfg.name='$name'
 				set system.$cfg.gpio_pin='$pin'
-				set system.$cfg.default='$default'
+				set system.$cfg.value='$default'
 			EOF
 		json_select ..
 	json_select ..
@@ -342,21 +407,28 @@ generate_gpioswitch() {
 json_init
 json_load "$(cat ${CFG})"

-generate_static_network
+if [ ! -s /etc/config/network ]; then
+	touch /etc/config/network
+	generate_static_network

-json_get_keys keys network
-for key in $keys; do generate_network $key; done
+	json_get_keys keys network
+	for key in $keys; do generate_network $key; done

-json_get_keys keys switch
-for key in $keys; do generate_switch $key; done
+	json_get_keys keys switch
+	for key in $keys; do generate_switch $key; done
+fi

-json_get_keys keys rssimon
-for key in $keys; do generate_rssimon $key; done
+if [ ! -s /etc/config/system ]; then
+	touch /etc/config/system
+	generate_static_system

-json_get_keys keys gpioswitch
-for key in $keys; do generate_gpioswitch $key; done
+	json_get_keys keys rssimon
+	for key in $keys; do generate_rssimon $key; done

-json_get_keys keys led
-for key in $keys; do generate_led $key; done
+	json_get_keys keys gpioswitch
+	for key in $keys; do generate_gpioswitch $key; done

+	json_get_keys keys led
+	for key in $keys; do generate_led $key; done
+fi
 uci commit
--- a/package/base-files/files/bin/login.sh
+++ b/package/base-files/files/bin/login.sh
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006-2011 OpenWrt.org
-
-if ( ! grep -qsE '^root:[!x]?:' /etc/shadow || \
-     ! grep -qsE '^root:[!x]?:' /etc/passwd ) && \
-   [ -z "$FAILSAFE" ]
-then
-	echo "Login failed."
-	exit 0
-else
-cat << EOF
- === IMPORTANT ============================
-  Use 'passwd' to set your login password!
- ------------------------------------------
-EOF
-fi
-
-exec /bin/ash --login
--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -1,13 +1,10 @@
-  _______                     ________        __
- |       |.-----.-----.-----.|  |  |  |.----.|  |_
- |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
- |_______||   __|_____|__|__||________||__|  |____|
-          |__| W I R E L E S S   F R E E D O M
- -----------------------------------------------------
- DESIGNATED DRIVER (%C, %R)
- -----------------------------------------------------
-  * 2 oz. Orange Juice         Combine all juices in a
-  * 2 oz. Pineapple Juice      tall glass filled with
-  * 2 oz. Grapefruit Juice     ice, stir well.
-  * 2 oz. Cranberry Juice
- -----------------------------------------------------
+     _________
+    /        /\      _    ___ ___  ___
+   /  LE    /  \    | |  | __|   \| __|
+  /    DE  /    \   | |__| _|| |) | _|
+ /________/  LE  \  |____|___|___/|___|                      lede-project.org
+ \        \   DE /
+  \    LE  \    /  -----------------------------------------------------------
+   \  DE    \  /    %N (%V, %C)
+    \________\/    -----------------------------------------------------------
+
--- a/package/base-files/files/etc/config/system
+++ b/package/base-files/files/etc/config/system
@@ -1,11 +0,0 @@
-config system
-	option hostname	OpenWrt
-	option timezone	UTC
-
-config timeserver ntp
-	list server	0.openwrt.pool.ntp.org
-	list server	1.openwrt.pool.ntp.org
-	list server	2.openwrt.pool.ntp.org
-	list server	3.openwrt.pool.ntp.org
-	option enabled 1
-	option enable_server 0
--- a/package/base-files/files/etc/fstab
+++ b/package/base-files/files/etc/fstab
@@ -0,0 +1 @@
+# <file system> <mount point> <type> <options> <dump> <pass>
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -38,24 +38,14 @@ boot() {

 	/sbin/kmodloader

-	# allow wifi modules time to settle
-	sleep 1
-
-	/sbin/wifi detect > /tmp/wireless.tmp
-	[ -s /tmp/wireless.tmp ] && {
-		cat /tmp/wireless.tmp >> /etc/config/wireless
+	[ ! -f /etc/config/wireless ] && {
+		# compat for brcm47xx and mvebu
+		sleep 1
 	}
-	rm -f /tmp/wireless.tmp

-	/bin/board_detect
+	/bin/config_generate
 	uci_apply_defaults
 	
 	# temporary hack until configd exists
 	/sbin/reload_config
-
-	# create /dev/root if it doesn't exist
-	[ -e /dev/root -o -h /dev/root ] || {
-		rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
-		[ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
-	}
 }
--- a/package/base-files/files/etc/init.d/led
+++ b/package/base-files/files/etc/init.d/led
@@ -8,6 +8,7 @@ load_led() {
 	local sysfs
 	local trigger
 	local dev
+	local ports
 	local mode
 	local default
 	local delayon
@@ -18,6 +19,7 @@ load_led() {
 	config_get name $1 name "$sysfs"
 	config_get trigger $1 trigger "none"
 	config_get dev $1 dev
+	config_get ports $1 port
 	config_get mode $1 mode "link"
 	config_get_bool default $1 default "nil"
 	config_get delayon $1 delayon
@@ -34,9 +36,24 @@ load_led() {
 		return
 	fi

+	[ "$trigger" = "usbdev" ] && {
+		# Backward compatibility: translate to the new trigger
+		trigger="usbport"
+		# Translate port of root hub, e.g. 4-1 -> usb4-port1
+		ports=$(echo "$dev" | sed -n 's/^\([0-9]*\)-\([0-9]*\)$/usb\1-port\2/p')
+		# Translate port of extra hub, e.g. 2-2.4 -> 2-2-port4
+		[ -z "$ports" ] && ports=$(echo "$dev" | sed -n 's/\./-port/p')
+	}
+
 	[ -e /sys/class/leds/${sysfs}/brightness ] && {
 		echo "setting up led ${name}"

+		printf "%s %s %d\n" \
+			"$sysfs" \
+			"$(sed -ne 's/^.*\[\(.*\)\].*$/\1/p' /sys/class/leds/${sysfs}/trigger)" \
+			"$(cat /sys/class/leds/${sysfs}/brightness)" \
+				>> /var/run/led.state
+
 		[ "$default" = 0 ] &&
 			echo 0 >/sys/class/leds/${sysfs}/brightness

@@ -58,18 +75,19 @@ load_led() {
 			}
 			;;

-		"timer")
+		"timer"|"oneshot")
 			[ -n "$delayon" ] && \
 				echo $delayon > /sys/class/leds/${sysfs}/delay_on
 			[ -n "$delayoff" ] && \
 				echo $delayoff > /sys/class/leds/${sysfs}/delay_off
 			;;

-		"usbdev")
-			[ -n "$dev" ] && {
-				echo $dev > /sys/class/leds/${sysfs}/device_name
-				echo $interval > /sys/class/leds/${sysfs}/activity_interval
-			}
+		"usbport")
+			local p
+
+			for p in $ports; do
+				echo 1 > /sys/class/leds/${sysfs}/ports/$p
+			done
 			;;

 		"port_state")
@@ -77,11 +95,6 @@ load_led() {
 				echo $port_state > /sys/class/leds/${sysfs}/port_state
 			;;

-		"morse")
-			echo $message > /sys/class/leds/${sysfs}/message
-			echo $delay > /sys/class/leds/${sysfs}/delay
-			;;
-
 		"gpio")
 			echo $gpio > /sys/class/leds/${sysfs}/gpio
 			echo $inverted > /sys/class/leds/${sysfs}/inverted
@@ -103,6 +116,18 @@ load_led() {

 start() {
 	[ -e /sys/class/leds/ ] && {
+		[ -s /var/run/led.state ] && {
+			local led trigger brightness
+			while read led trigger brightness; do
+				[ -e "/sys/class/leds/$led/trigger" ] && \
+					echo "$trigger" > "/sys/class/leds/$led/trigger"
+
+				[ -e "/sys/class/leds/$led/brightness" ] && \
+					echo "$brightness" > "/sys/class/leds/$led/brightness"
+			done < /var/run/led.state
+			rm /var/run/led.state
+		}
+
 		config_load system
 		config_foreach load_led led
 	}
--- a/package/base-files/files/etc/init.d/sysctl
+++ b/package/base-files/files/etc/init.d/sysctl
@@ -2,7 +2,23 @@
 # Copyright (C) 2006 OpenWrt.org

 START=11
+
+set_vm_min_free() {
+	mem="$(grep MemTotal /proc/meminfo  | awk '{print $2}')"
+	if [ "$mem" -gt 65536 ]; then # 128M
+		val=16384
+	elif [ "$mem" -gt 32768 ]; then # 64M
+		val=8192
+	elif [ "$mem" -gt 16384 ]; then # 32M
+		val=1024
+	else
+		return
+	fi
+	sysctl -qw vm.min_free_kbytes="$val"
+}
+
 start() {
+	set_vm_min_free
 	for CONF in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
 		[ -f "$CONF" ] && sysctl -p "$CONF" -e >&-
 	done
--- a/package/base-files/files/etc/init.d/sysfixtime
+++ b/package/base-files/files/etc/init.d/sysfixtime
@@ -10,16 +10,25 @@ HWCLOCK=/sbin/hwclock
 boot() {
 	start && exit 0

+	local maxtime="$(maxtime)"
 	local curtime="$(date +%s)"
-	local maxtime="$(find /etc -type f -exec date -r {} +%s \; | sort -nr | head -n1)"
 	[ $curtime -lt $maxtime ] && date -s @$maxtime
 }

 start() {
-	[ -e "$RTC_DEV" ] && [ -e "$HWCLOCK" ] && $HWCLOCK -s -f $RTC_DEV
+	[ -e "$RTC_DEV" ] && [ -e "$HWCLOCK" ] && $HWCLOCK -s -u -f $RTC_DEV
 }

 stop() {
-	[ -e "$RTC_DEV" ] && [ -e "$HWCLOCK" ] && $HWCLOCK -w -f $RTC_DEV && \
+	[ -e "$RTC_DEV" ] && [ -e "$HWCLOCK" ] && $HWCLOCK -w -u -f $RTC_DEV && \
 		logger -t sysfixtime "saved '$(date)' to $RTC_DEV"
 }
+
+maxtime() {
+	local file newest
+
+	for file in $( find /etc -type f ) ; do
+		[ -z "$newest" -o "$newest" -ot "$file" ] && newest=$file
+	done
+	[ "$newest" ] && date -r "$newest" +%s
+}
--- a/package/base-files/files/etc/init.d/system
+++ b/package/base-files/files/etc/init.d/system
@@ -7,7 +7,7 @@ USE_PROCD=1
 validate_system_section()
 {
 	uci_validate_section system system "${1}" \
-		'hostname:string:OpenWrt' \
+		'hostname:string:lede' \
 		'conloglevel:uinteger' \
 		'buffersize:uinteger' \
 		'timezone:string:UTC' \
--- a/package/base-files/files/etc/init.d/urandom_seed
+++ b/package/base-files/files/etc/init.d/urandom_seed
@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+
+start_service() {
+    procd_open_instance "urandom_seed"
+    procd_set_param command "/sbin/urandom_seed"
+    procd_set_param stdout 1
+    procd_set_param stderr 1
+    procd_close_instance
+}
--- a/package/base-files/files/etc/inittab
+++ b/package/base-files/files/etc/inittab
@@ -1,3 +1,3 @@
 ::sysinit:/etc/init.d/rcS S boot
 ::shutdown:/etc/init.d/rcS K shutdown
-::askconsole:/bin/ash --login
+::askconsole:/usr/libexec/login.sh
--- a/package/base-files/files/etc/iproute2/rt_protos
+++ b/package/base-files/files/etc/iproute2/rt_protos
@@ -0,0 +1,18 @@
+#
+# Reserved protocols.
+#
+0	unspec
+1	redirect
+2	kernel
+3	boot
+4	static
+8	gated
+9	ra
+10	mrt
+11	zebra
+12	bird
+13	dnrouted
+14	xorp
+15	ntk
+16	dhcp
+42	babel
--- a/package/base-files/files/etc/openwrt_release
+++ b/package/base-files/files/etc/openwrt_release
@@ -1,7 +1,8 @@
 DISTRIB_ID='%D'
-DISTRIB_RELEASE='%C'
+DISTRIB_RELEASE='%V'
 DISTRIB_REVISION='%R'
 DISTRIB_CODENAME='%n'
 DISTRIB_TARGET='%S'
-DISTRIB_DESCRIPTION='%D %N %V'
+DISTRIB_ARCH='%A'
+DISTRIB_DESCRIPTION='%D %N %V %C'
 DISTRIB_TAINTS='%t'
--- a/package/base-files/files/etc/openwrt_version
+++ b/package/base-files/files/etc/openwrt_version
@@ -1 +1 @@
-%V
+%C
--- a/package/base-files/files/etc/opkg/keys/af22f7a88858c8e9
+++ b/package/base-files/files/etc/opkg/keys/af22f7a88858c8e9
@@ -1,2 +0,0 @@
-untrusted comment: openwrt.org snapshot build key
-RWSvIveoiFjI6WS/h3J8Us0wUEjA53cQLuHJEwOD/sT5JsGvguZjlKmU
--- a/package/base-files/files/etc/os-release
+++ b/package/base-files/files/etc/os-release
@@ -0,0 +1 @@
+../usr/lib/os-release
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -6,23 +6,6 @@

 export PATH="%PATH%"

-pi_ifname=
-pi_ip=192.168.1.1
-pi_broadcast=192.168.1.255
-pi_netmask=255.255.255.0
-
-fs_failsafe_ifname=
-fs_failsafe_ip=192.168.1.1
-fs_failsafe_broadcast=192.168.1.255
-fs_failsafe_netmask=255.255.255.0
-
-fs_failsafe_wait_timeout=2
-
-pi_suppress_stderr="y"
-pi_init_suppress_stderr="y"
-pi_init_path="%PATH%"
-pi_init_cmd="/sbin/init"
-
 . /lib/functions.sh
 . /lib/functions/preinit.sh
 . /lib/functions/system.sh
--- a/package/base-files/files/etc/profile
+++ b/package/base-files/files/etc/profile
@@ -11,12 +11,16 @@ export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6)
 export HOME=${HOME:-/root}
 export PS1='\u@\h:\w\$ '

+[ "$TERM" = "xterm" ] && export PS1='\[\e]0;\u@\h: \w\a\]'$PS1
+
 [ -x /bin/more ] || alias more=less
 [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi

+alias ll='ls -alF --color=auto'
+
 [ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc

-[ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; }
+[ -x /usr/bin/arp -o -x /sbin/arp ] || arp() { cat /proc/net/arp; }
 [ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }

 [ -n "$FAILSAFE" ] || {
@@ -25,3 +29,24 @@ export PS1='\u@\h:\w\$ '
 	done
 	unset FILE
 }
+
+if ( grep -qs '^root::' /etc/shadow && \
+     [ -z "$FAILSAFE" ] )
+then
+cat << EOF
+=== WARNING! =====================================
+There is no root password defined on this device!
+Use the "passwd" command to set up a new password
+in order to prevent unauthorized SSH logins.
+--------------------------------------------------
+EOF
+fi
+
+service() {
+	[ -f "/etc/init.d/$1" ] || {
+		echo "service "'"'"$1"'"'" not found, the following services are available:"
+		ls "/etc/init.d"
+		return 1
+	}
+	/etc/init.d/$@
+}
--- a/package/base-files/files/etc/rc.button/reset
+++ b/package/base-files/files/etc/rc.button/reset
@@ -2,8 +2,12 @@

 . /lib/functions.sh

+OVERLAY="$( grep ' /overlay ' /proc/mounts )"
+
 case "$ACTION" in
 pressed)
+	[ -z "$OVERLAY" ] && return 0
+
 	return 5
 ;;
 timeout)
@@ -16,7 +20,7 @@ released)
 		echo "REBOOT" > /dev/console
 		sync
 		reboot
-	elif [ "$SEEN" -gt 5 ]
+	elif [ "$SEEN" -gt 5 -a -n "$OVERLAY" ]
 	then
 		echo "FACTORY RESET" > /dev/console
 		jffs2reset -y && reboot &
--- a/package/base-files/files/etc/rc.button/rfkill
+++ b/package/base-files/files/etc/rc.button/rfkill
@@ -4,7 +4,7 @@

 . /lib/functions.sh

-local rfkill_state=0
+rfkill_state=0

 wifi_rfkill_set() {
 	uci set wireless.$1.disabled=$rfkill_state
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -102,9 +102,11 @@ ${INIT_TRACE:+set -x}
 	. $IPKG_INSTROOT/lib/functions/procd.sh
 	basescript=$(readlink "$initscript")
 	rc_procd() {
+		local method="set"
+		[ -n "$2" ] && method="add"
 		procd_open_service "$(basename ${basescript:-$initscript})" "$initscript"
 		"$@"
-		procd_close_service
+		procd_close_service "$method"
 	}

 	start() {
--- a/package/base-files/files/etc/uci-defaults/10_migrate-shadow
+++ b/package/base-files/files/etc/uci-defaults/10_migrate-shadow
@@ -1,7 +1,7 @@
 #!/bin/sh

-local ppwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/passwd)"
-local spwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/shadow)"
+ppwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/passwd)"
+spwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/shadow)"

 if [ -n "${ppwd#[\!x]}" ] && [ -z "${spwd#[\!x]}" ]; then
 	logger -t migrate-shadow "Moving root password hash into shadow database"
--- a/package/base-files/files/etc/uci-defaults/13_fix_group_user
+++ b/package/base-files/files/etc/uci-defaults/13_fix_group_user
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+for file in `grep -sl Require-User /usr/lib/opkg/info/*.control`; do
+	file="${file##*/}"
+	file="${file%.control}"
+	add_group_and_user "${file}"
+done
+
+exit 0
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -164,20 +164,28 @@ insert_modules() {
 }

 default_prerm() {
+	local root="${IPKG_INSTROOT}"
 	local name
+
 	name=$(basename ${1%.*})
-	[ -f /usr/lib/opkg/info/${name}.prerm-pkg ] && . /usr/lib/opkg/info/${name}.prerm-pkg
-	for i in `cat /usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do
-		$i disable
-		$i stop
+	[ -f "$root/usr/lib/opkg/info/${name}.prerm-pkg" ] && . "$root/usr/lib/opkg/info/${name}.prerm-pkg"
+
+	local shell="$(which bash)"
+	for i in `cat "$root/usr/lib/opkg/info/${name}.list" | grep "^/etc/init.d/"`; do
+		if [ -n "$root" ]; then
+			${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable
+		else
+			if [ "$PKG_UPGRADE" != "1" ]; then
+				"$i" disable
+			fi
+			"$i" stop || /bin/true
+		fi
 	done
 }

-default_postinst() {
-	local root="${IPKG_INSTROOT}"
-	local pkgname="$(basename ${1%.*})"
+add_group_and_user() {
+	local pkgname="$1"
 	local rusers="$(sed -ne 's/^Require-User: *//p' $root/usr/lib/opkg/info/${pkgname}.control 2>/dev/null)"
-	local ret=0

 	if [ -n "$rusers" ]; then
 		local tuple oIFS="$IFS"
@@ -208,25 +216,48 @@ default_postinst() {
 			unset uid gid uname gname
 		done
 	fi
+}
+
+default_postinst() {
+	local root="${IPKG_INSTROOT}"
+	local pkgname="$(basename ${1%.*})"
+	local ret=0
+
+	add_group_and_user "${pkgname}"

 	if [ -f "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" ]; then
 		( . "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" )
 		ret=$?
 	fi

+	if [ -d "$root/rootfs-overlay" ]; then
+		cp -R $root/rootfs-overlay/. $root/
+		rm -fR $root/rootfs-overlay/
+	fi
+
+	if [ -z "$root" ] && grep -q -s "^/etc/uci-defaults/" "/usr/lib/opkg/info/${pkgname}.list"; then
+		. /lib/functions/system.sh
+		[ -d /tmp/.uci ] || mkdir -p /tmp/.uci
+		for i in $(sed -ne 's!^/etc/uci-defaults/!!p' "/usr/lib/opkg/info/${pkgname}.list"); do (
+			cd /etc/uci-defaults
+			[ -f "$i" ] && . "$i" && rm -f "$i"
+		) done
+		uci commit
+	fi
+
 	[ -n "$root" ] || rm -f /tmp/luci-indexcache 2>/dev/null

-	if [ "$PKG_UPGRADE" != "1" ]; then
-		local shell="$(which bash)"
-		for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do
-			if [ -n "$root" ]; then
-				${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable
-			else
+	local shell="$(which bash)"
+	for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do
+		if [ -n "$root" ]; then
+			${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable
+		else
+			if [ "$PKG_UPGRADE" != "1" ]; then
 				"$i" enable
-				"$i" start
 			fi
-		done
-	fi
+			"$i" start
+		fi
+	done

 	return $ret
 }
--- a/package/base-files/files/lib/functions/leds.sh
+++ b/package/base-files/files/lib/functions/leds.sh
@@ -21,12 +21,6 @@ led_off() {
 	led_set_attr $1 "brightness" 0
 }

-led_morse() {
-	led_set_attr $1 "trigger" "morse"
-	led_set_attr $1 "delay" "$2"
-	led_set_attr $1 "message" "$3"
-}
-
 status_led_set_timer() {
 	led_timer $status_led "$1" "$2"
 	[ -n "$status_led2" ] && led_timer $status_led2 "$1" "$2"
@@ -36,11 +30,6 @@ status_led_set_heartbeat() {
 	led_set_attr $status_led "trigger" "heartbeat"
 }

-status_led_set_morse() {
-	led_morse $status_led "$1" "$2"
-	[ -n "$status_led2" ] && led_morse $status_led2 "$1" "$2"
-}
-
 status_led_on() {
 	led_on $status_led
 	[ -n "$status_led2" ] && led_on $status_led2
--- a/package/base-files/files/lib/functions/network.sh
+++ b/package/base-files/files/lib/functions/network.sh
@@ -29,18 +29,9 @@ network_get_ipaddr() {
 # 1: destination variable
 # 2: interface
 network_get_ipaddr6() {
-	local __addr
-
-	if __network_ifstatus "__addr" "$2" "['ipv6-address','ipv6-prefix-assignment'][0].address"; then
-		case "$__addr" in
-			*:)	export "$1=${__addr}1" ;;
-			*)	export "$1=${__addr}" ;;
-		esac
-		return 0
-	fi
-
-	unset $1
-	return 1
+	__network_ifstatus "$1" "$2" "['ipv6-address'][0].address" || \
+		__network_ifstatus "$1" "$2" "['ipv6-prefix-assignment'][0]['local-address'].address" || \
+		return 1
 }

 # determine first IPv4 subnet of given logical interface
@@ -54,7 +45,36 @@ network_get_subnet() {
 # 1: destination variable
 # 2: interface
 network_get_subnet6() {
-	__network_ifstatus "$1" "$2" "['ipv6-address'][0]['address','mask']" "/"
+	local __nets __addr
+
+	if network_get_subnets6 __nets "$2"; then
+		# Attempt to return first non-fe80::/10, non-fc::/7 range
+		for __addr in $__nets; do
+			case "$__addr" in fe[8ab]?:*|f[cd]??:*)
+				continue
+			esac
+			export "$1=$__addr"
+			return 0
+		done
+
+		# Attempt to return first non-fe80::/10 range
+		for __addr in $__nets; do
+			case "$__addr" in fe[8ab]?:*)
+				continue
+			esac
+			export "$1=$__addr"
+			return 0
+		done
+
+		# Return first item
+		for __addr in $__nets; do
+			export "$1=$__addr"
+			return 0
+		done
+	fi
+
+	unset "$1"
+	return 1
 }

 # determine first IPv6 prefix of given logical interface
@@ -78,14 +98,19 @@ network_get_ipaddrs6() {
 	local __addr
 	local __list=""

-	if __network_ifstatus "__addr" "$2" "['ipv6-address','ipv6-prefix-assignment'][*].address"; then
+	if __network_ifstatus "__addr" "$2" "['ipv6-address'][*].address"; then
 		for __addr in $__addr; do
-			case "$__addr" in
-				*:) __list="${__list:+$__list }${__addr}1" ;;
-				*)  __list="${__list:+$__list }${__addr}"  ;;
-			esac
+			__list="${__list:+$__list }${__addr}"
 		done
+	fi

+	if __network_ifstatus "__addr" "$2" "['ipv6-prefix-assignment'][*]['local-address'].address"; then
+		for __addr in $__addr; do
+			__list="${__list:+$__list }${__addr}"
+		done
+	fi
+
+	if [ -n "$__list" ]; then
 		export "$1=$__list"
 		return 0
 	fi
@@ -98,18 +123,13 @@ network_get_ipaddrs6() {
 # 1: destination variable
 # 2: interface
 network_get_ipaddrs_all() {
-	local __addr
-	local __list=""
+	local __addr __addr6

-	if __network_ifstatus "__addr" "$2" "['ipv4-address','ipv6-address','ipv6-prefix-assignment'][*].address"; then
-		for __addr in $__addr; do
-			case "$__addr" in
-				*:) __list="${__list:+$__list }${__addr}1" ;;
-				*)  __list="${__list:+$__list }${__addr}"  ;;
-			esac
-		done
+	network_get_ipaddrs __addr "$2"
+	network_get_ipaddrs6 __addr6 "$2"

-		export "$1=$__list"
+	if [ -n "$__addr" -o -n "$__addr6" ]; then
+		export "$1=${__addr:+$__addr }$__addr6"
 		return 0
 	fi

@@ -128,17 +148,24 @@ network_get_subnets() {
 # 1: destination variable
 # 2: interface
 network_get_subnets6() {
-	local __addr
+	local __addr __mask
 	local __list=""

-	if __network_ifstatus "__addr" "$2" "['ipv6-address','ipv6-prefix-assignment'][*]['address','mask']" "/ "; then
+	if __network_ifstatus "__addr" "$2" "['ipv6-address'][*]['address','mask']" "/ "; then
 		for __addr in $__addr; do
-			case "$__addr" in
-				*:/*) __list="${__list:+$__list }${__addr%/*}1/${__addr##*/}" ;;
-				*)    __list="${__list:+$__list }${__addr}"                   ;;
-			esac
+			__list="${__list:+$__list }${__addr}"
 		done
+	fi

+	if __network_ifstatus "__addr" "$2" "['ipv6-prefix-assignment'][*]['local-address'].address" && \
+	   __network_ifstatus "__mask" "$2" "['ipv6-prefix-assignment'][*].mask"; then
+		for __addr in $__addr; do
+			__list="${__list:+$__list }${__addr}/${__mask%% *}"
+			__mask="${__mask#* }"
+		done
+	fi
+
+	if [ -n "$__list" ]; then
 		export "$1=$__list"
 		return 0
 	fi
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -1,7 +1,5 @@
 #!/bin/ash

-CFG=/etc/board.json
-
 . /lib/functions.sh
 . /usr/share/libubox/jshn.sh

@@ -37,7 +35,7 @@ _ucidef_set_interface() {
 	json_select_object "$name"
 	json_add_string ifname "$iface"

-	if ! json_is_a protocol string; then
+	if ! json_is_a protocol string || [ -n "$proto" ]; then
 		case "$proto" in
 			static|dhcp|none|pppoe) : ;;
 			*)
@@ -96,7 +94,7 @@ ucidef_set_interface_raw() {
 }

 _ucidef_add_switch_port() {
-	# inherited: $num $device $need_tag $role $index $prev_role
+	# inherited: $num $device $need_tag $want_untag $role $index $prev_role
 	# inherited: $n_cpu $n_ports $n_vlan $cpu0 $cpu1 $cpu2 $cpu3 $cpu4 $cpu5

 	n_ports=$((n_ports + 1))
@@ -104,10 +102,11 @@ _ucidef_add_switch_port() {
 	json_select_array ports
 		json_add_object
 			json_add_int num "$num"
-			[ -n "$device"   ] && json_add_string  device   "$device"
-			[ -n "$need_tag" ] && json_add_boolean need_tag "$need_tag"
-			[ -n "$role"     ] && json_add_string  role     "$role"
-			[ -n "$index"    ] && json_add_int     index    "$index"
+			[ -n "$device"     ] && json_add_string  device     "$device"
+			[ -n "$need_tag"   ] && json_add_boolean need_tag   "$need_tag"
+			[ -n "$want_untag" ] && json_add_boolean want_untag "$want_untag"
+			[ -n "$role"       ] && json_add_string  role       "$role"
+			[ -n "$index"      ] && json_add_int     index      "$index"
 		json_close_object
 	json_select ..

@@ -142,7 +141,7 @@ _ucidef_add_switch_port() {

 _ucidef_finish_switch_roles() {
 	# inherited: $name $n_cpu $n_vlan $cpu0 $cpu1 $cpu2 $cpu3 $cpu4 $cpu5
-	local index role roles num device need_tag port ports
+	local index role roles num device need_tag want_untag port ports

 	json_select switch
 		json_select "$name"
@@ -157,7 +156,7 @@ _ucidef_finish_switch_roles() {
 			json_select "$name"
 				json_select ports
 					json_select "$port"
-						json_get_vars num device need_tag
+						json_get_vars num device need_tag want_untag
 					json_select ..
 				json_select ..

@@ -209,10 +208,15 @@ ucidef_add_switch() {
 						num="${port%%@*}"
 						device="${port##*@}"
 						need_tag=0
+						want_untag=0
 						[ "${num%t}" != "$num" ] && {
 							num="${num%t}"
 							need_tag=1
 						}
+						[ "${num%u}" != "$num" ] && {
+							num="${num%u}"
+							want_untag=1
+						}
 					;;
 					[0-9]*:*:[0-9]*)
 						num="${port%%:*}"
@@ -229,7 +233,7 @@ ucidef_add_switch() {
 					_ucidef_add_switch_port
 				fi

-				unset num device role index need_tag
+				unset num device role index need_tag want_untag
 			done
 		json_select ..
 	json_select ..
@@ -392,6 +396,30 @@ ucidef_set_led_usbdev() {
 	json_select ..
 }

+ucidef_set_led_usbport() {
+	local obj="$1"
+	local name="$2"
+	local sysfs="$3"
+	shift
+	shift
+	shift
+
+	json_select_object led
+
+	json_select_object "$obj"
+	json_add_string name "$name"
+	json_add_string type usbport
+	json_add_string sysfs "$sysfs"
+	json_select_array ports
+		for port in "$@"; do
+			json_add_string port "$port"
+		done
+	json_select ..
+	json_select ..
+
+	json_select ..
+}
+
 ucidef_set_led_wlan() {
 	local cfg="led_$1"
 	local name="$2"
@@ -432,6 +460,25 @@ ucidef_set_led_switch() {
 	json_select ..
 }

+ucidef_set_led_portstate() {
+	local cfg="led_$1"
+	local name="$2"
+	local sysfs="$3"
+	local port_state="$4"
+
+	json_select_object led
+
+	json_select_object "$1"
+	json_add_string name "$name"
+	json_add_string type portstate
+	json_add_string sysfs "$sysfs"
+	json_add_string trigger port_state
+	json_add_string port_state "$port_state"
+	json_select ..
+
+	json_select ..
+}
+
 ucidef_set_led_default() {
 	local cfg="led_$1"
 	local name="$2"
@@ -572,6 +619,26 @@ ucidef_add_gpio_switch() {
 	json_select ..
 }

+ucidef_set_hostname() {
+	local hostname="$1"
+
+	json_select_object system
+		json_add_string hostname "$hostname"
+	json_select ..
+}
+
+ucidef_set_ntpserver() {
+	local server
+
+	json_select_object system
+		json_select_array ntpserver
+			for server in "$@"; do
+				json_add_string "" "$server"
+			done
+		json_select ..
+	json_select ..
+}
+
 board_config_update() {
 	json_init
 	[ -f ${CFG} ] && json_load "$(cat ${CFG})"
--- a/package/base-files/files/lib/preinit/10_indicate_failsafe
+++ b/package/base-files/files/lib/preinit/10_indicate_failsafe
@@ -9,6 +9,7 @@ indicate_failsafe_led () {
 }

 indicate_failsafe() {
+	[ "$pi_preinit_no_failsafe" = "y" ] && return
 	echo "- failsafe -"
 	preinit_net_echo "Entering Failsafe!\n"
 	indicate_failsafe_led
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -2,23 +2,134 @@
 # Copyright (C) 2006 OpenWrt.org
 # Copyright (C) 2010 Vertical Communications

+preinit_ip_config() {
+	local netdev vid
+
+	netdev=${1%\.*}
+	vid=${1#*\.}
+
+	if [ "$vid" = "$netdev" ]; then
+		vid=
+	fi
+
+	grep -q "$netdev" /proc/net/dev || return
+
+	if [ -n "$vid" ]; then
+		ip link add link $netdev name $1 type vlan id $vid
+	fi
+
+	ip link set dev $netdev up
+	ip -4 address add $pi_ip/$pi_netmask broadcast $pi_broadcast dev $1
+}
+
+preinit_config_switch() {
+	local role roles ports device enable reset
+
+	local name=$1
+	local lan_if=$2
+
+	json_select switch
+	json_select $name
+
+	json_get_vars enable reset
+
+	if json_is_a roles array; then
+		json_get_keys roles roles
+		json_select roles
+
+		for role in $roles; do
+			json_select "$role"
+			json_get_vars ports device
+			json_select ..
+
+			if [ "$device" = "$lan_if" ]; then
+				swconfig dev $name set reset $reset
+				swconfig dev $name set enable_vlan $enable
+				swconfig dev $name vlan $role set ports "$ports"
+				swconfig dev $name set apply
+			fi
+		done
+
+		json_select ..
+	fi
+
+	json_select ..
+	json_select ..
+}
+
+preinit_config_board() {
+	/bin/board_detect /tmp/board.json
+
+	[ -f "/tmp/board.json" ] || return
+
+	. /usr/share/libubox/jshn.sh
+
+	json_init
+	json_load "$(cat /tmp/board.json)"
+
+	json_select network
+		json_select "lan"
+			json_get_vars ifname
+		json_select ..
+	json_select ..
+
+	[ -n "$ifname" ] || return
+
+	# only use the first one
+	ifname=${ifname%% *}
+
+	if [ -x /sbin/swconfig ]; then
+		# configure the switch, if present
+
+		json_get_keys keys switch
+		for key in $keys; do
+			preinit_config_switch $key $ifname
+		done
+	else
+		# trim any vlan ids
+		ifname=${ifname%\.*}
+	fi
+
+	pi_ifname=$ifname
+
+	preinit_ip_config $pi_ifname
+}
+
 preinit_ip() {
+	[ "$pi_preinit_no_failsafe" = "y" ] && return
+
 	# if the preinit interface isn't specified and ifname is set in
 	# preinit.arch use that interface
 	if [ -z "$pi_ifname" ]; then
 		pi_ifname=$ifname
 	fi

-	[ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
-		ip link set dev $pi_ifname up
-		ip -4 address add $pi_ip/$pi_netmask broadcast $pi_broadcast dev $pi_ifname
-	}
+	if [ -n "$pi_ifname" ]; then
+		preinit_ip_config $pi_ifname
+	elif [ -d "/etc/board.d/" ]; then
+		preinit_config_board
+	fi
+
+	preinit_net_echo "Doing Lede Preinit\n"
 }

 preinit_ip_deconfig() {
 	[ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
+		local netdev vid
+
+		netdev=${pi_ifname%\.*}
+		vid=${pi_ifname#*\.}
+
+		if [ "$vid" = "$netdev" ]; then
+			vid=
+		fi
+
 		ip -4 address flush dev $pi_ifname
-		ip link set dev $pi_ifname down
+		ip link set dev $netdev down
+
+		if [ -n "$vid" ]; then
+			ip link delete $pi_ifname
+		fi
 	}
 }

@@ -39,7 +150,6 @@ preinit_echo() {
 }

 pi_indicate_preinit() {
-	preinit_net_echo "Doing OpenWrt Preinit\n"
 	set_state preinit
 }

--- a/package/base-files/files/lib/preinit/10_sysinfo
+++ b/package/base-files/files/lib/preinit/10_sysinfo
@@ -3,7 +3,7 @@ do_sysinfo_generic() {
 	mkdir -p /tmp/sysinfo
 	[ -e /tmp/sysinfo/board_name ] || \
 		echo "$(strings /proc/device-tree/compatible | head -1)" > /tmp/sysinfo/board_name
-	[ -e /tmp/sysinfo/model ] || \
+	[ ! -e /tmp/sysinfo/model -a -e /proc/device-tree/model ] && \
 		echo "$(cat /proc/device-tree/model)" > /tmp/sysinfo/model
 }

--- a/package/base-files/files/lib/preinit/30_failsafe_wait
+++ b/package/base-files/files/lib/preinit/30_failsafe_wait
@@ -39,7 +39,7 @@ fs_wait_for_key () {
 		rm -f $keypress_wait
 	} &

-	echo "Press the [$1] key and hit [enter] $2"
+	[ "$pi_preinit_no_failsafe" != "y" ] && echo "Press the [$1] key and hit [enter] $2"
 	echo "Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level"
 	# if we're on the console we wait for input
 	{
@@ -82,6 +82,10 @@ fs_wait_for_key () {

 failsafe_wait() {
 	FAILSAFE=
+	[ "$pi_preinit_no_failsafe" == "y" ] && {
+		fs_wait_for_key "" "" $fs_failsafe_wait_timeout
+		return
+	}
 	grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE
 	if [ "$FAILSAFE" != "true" ]; then
 		pi_failsafe_net_message=true
--- a/package/base-files/files/lib/preinit/40_run_failsafe_hook
+++ b/package/base-files/files/lib/preinit/40_run_failsafe_hook
@@ -3,6 +3,7 @@
 # Copyright (C) 2010 Vertical Communications

 run_failsafe_hook() {
+    [ "$pi_preinit_no_failsafe" = "y" ] && return
    if [ "$FAILSAFE" = "true" ]; then
 	boot_run_hook failsafe
 	lock -w /tmp/.failsafe
--- a/package/base-files/files/lib/preinit/81_urandom_seed
+++ b/package/base-files/files/lib/preinit/81_urandom_seed
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+log_urandom_seed() {
+    echo "urandom-seed: $1" > /dev/kmsg
+}
+
+_do_urandom_seed() {
+    [ -f "$1" ] || { log_urandom_seed "Seed file not found ($1)"; return; }
+    [ -O "$1" -a -G "$1" -a ! -x "$1" ] || { log_urandom_seed "Wrong owner / permissions for $1"; return; }
+
+    log_urandom_seed "Seeding with $1"
+    cat "$1" > /dev/urandom
+}
+
+do_urandom_seed() {
+    [ -c /dev/urandom ] || { log_urandom_seed "Something is wrong with /dev/urandom"; return; }
+
+    _do_urandom_seed "/etc/urandom.seed"
+
+    SEED="$(uci -q get system.@system[0].urandom_seed)"
+    [ "${SEED:0:1}" == "/" -a "$SEED" != "/etc/urandom.seed" ] && _do_urandom_seed "$SEED"
+}
+
+boot_hook_add preinit_main do_urandom_seed
--- a/package/base-files/files/lib/preinit/99_10_failsafe_login
+++ b/package/base-files/files/lib/preinit/99_10_failsafe_login
@@ -11,6 +11,7 @@ failsafe_shell() {
 	lock /tmp/.failsafe
 	ash --login
 	echo "Please reboot system when done with failsafe network logins"
+	while true; do sleep 1; done
 }

 boot_hook_add failsafe failsafe_netlogin
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -53,7 +53,8 @@ run_ramfs() { # <command> [...]
 		/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
+		/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
@@ -69,6 +70,8 @@ run_ramfs() { # <command> [...]
 	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
@@ -127,7 +130,7 @@ kill_remaining() { # [ <signal> ]
 		else 
 			case "$name" in
 				# Skip essential services
-				*procd*|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*|*nas*) : ;;
+				*procd*|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*|*nas*|*relayd*) : ;;

 				# Killable process
 				*)
@@ -204,6 +207,96 @@ get_magic_long() {
 	(get_image "$@" | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null
 }

+export_bootdevice() {
+	local cmdline uuid disk uevent
+	local MAJOR MINOR DEVNAME DEVTYPE
+
+	if read cmdline < /proc/cmdline; then
+		case "$cmdline" in
+			*block2mtd=*)
+				disk="${cmdline##*block2mtd=}"
+				disk="${disk%%,*}"
+			;;
+			*root=*)
+				disk="${cmdline##*root=}"
+				disk="${disk%% *}"
+			;;
+		esac
+
+		case "$disk" in
+			PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02)
+				uuid="${disk#PARTUUID=}"
+				uuid="${uuid%-02}"
+				for disk in $(find /dev -type b); do
+					set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
+					if [ "$4$3$2$1" = "$uuid" ]; then
+						uevent="/sys/class/block/${disk##*/}/uevent"
+						break
+					fi
+				done
+			;;
+			/dev/*)
+				uevent="/sys/class/block/${disk##*/}/uevent"
+			;;
+		esac
+
+		if [ -e "$uevent" ]; then
+			. "$uevent"
+
+			export BOOTDEV_MAJOR=$MAJOR
+			export BOOTDEV_MINOR=$MINOR
+			return 0
+		fi
+	fi
+
+	return 1
+}
+
+export_partdevice() {
+	local var="$1" offset="$2"
+	local uevent MAJOR MINOR DEVNAME DEVTYPE
+
+	for uevent in /sys/class/block/*/uevent; do
+		. "$uevent"
+		if [ $BOOTDEV_MAJOR = $MAJOR -a $(($BOOTDEV_MINOR + $offset)) = $MINOR -a -b "/dev/$DEVNAME" ]; then
+			export "$var=$DEVNAME"
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+get_partitions() { # <device> <filename>
+	local disk="$1"
+	local filename="$2"
+
+	if [ -b "$disk" -o -f "$disk" ]; then
+		v "Reading partition table from $filename..."
+
+		local magic="$(hexdump -v -n 2 -s 0x1FE -e '1/2 "0x%04X"' "$disk")"
+		if [ "$magic" != 0xAA55 ]; then
+			v "Invalid partition table on $disk"
+			exit
+		fi
+
+		rm -f "/tmp/partmap.$filename"
+
+		local part
+		for part in 1 2 3 4; do
+			set -- $(hexdump -v -n 12 -s "$((0x1B2 + $part * 16))" -e '3/4 "0x%08X "' "$disk")
+
+			local type="$(($1 % 256))"
+			local lba="$(($2))"
+			local num="$(($3))"
+
+			[ $type -gt 0 ] || continue
+
+			printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename"
+		done
+	fi
+}
+
 jffs2_copy_config() {
 	if grep rootfs_data /proc/mtd >/dev/null; then
 		# squashfs+jffs2
@@ -243,6 +336,7 @@ do_upgrade() {
 	[ -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
--- a/package/base-files/files/lib/upgrade/fwtool.sh
+++ b/package/base-files/files/lib/upgrade/fwtool.sh
@@ -0,0 +1,43 @@
+fwtool_pre_upgrade() {
+	fwtool -q -i /dev/null "$1"
+}
+
+fwtool_check_image() {
+	[ $# -gt 1 ] && return 1
+
+	. /usr/share/libubox/jshn.sh
+
+	if ! fwtool -q -i /tmp/sysupgrade.meta "$1"; then
+		echo "Image metadata not found"
+		[ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && {
+			echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"
+		}
+		[ "$REQUIRE_IMAGE_METADATA" = 1 ] && return 1
+		return 0
+	fi
+
+	json_load "$(cat /tmp/sysupgrade.meta)" || {
+		echo "Invalid image metadata"
+		return 1
+	}
+
+	device="$(cat /tmp/sysinfo/board_name)"
+
+	json_select supported_devices || return 1
+
+	json_get_keys dev_keys
+	for k in $dev_keys; do
+		json_get_var dev "$k"
+		[ "$dev" = "$device" ] && return 0
+	done
+
+	echo "Device $device not supported by this image"
+	echo -n "Supported devices:"
+	for k in $dev_keys; do
+		json_get_var dev "$k"
+		echo -n " $dev"
+	done
+	echo
+
+	return 1
+}
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -128,7 +128,8 @@ add_overlayfiles() {
 }

 # hooks
-sysupgrade_image_check="platform_check_image"
+sysupgrade_image_check="fwtool_check_image platform_check_image"
+sysupgrade_pre_upgrade="fwtool_pre_upgrade"
 [ $SAVE_OVERLAY = 0 -o ! -d /overlay/etc ] && \
 	sysupgrade_init_conffiles="add_uci_conffiles" || \
 	sysupgrade_init_conffiles="add_overlayfiles"
--- a/package/base-files/files/sbin/urandom_seed
+++ b/package/base-files/files/sbin/urandom_seed
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+trap '[ "$?" -eq 0 ] || echo "An error occured" >&2' EXIT
+
+save() {
+    touch "$1.tmp"
+    chown root:root "$1.tmp"
+    chmod 600 "$1.tmp"
+    getrandom 512 > "$1.tmp"
+    mv "$1.tmp" "$1"
+    echo "Seed saved ($1)"
+}
+
+SEED="$(uci -q get system.@system[0].urandom_seed || true)"
+[ "${SEED:0:1}" == "/" ] && save "$SEED"
+
+SEED=/etc/urandom.seed
+[ ! -f $SEED ] && save "$SEED"
+true
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -6,8 +6,8 @@

 usage() {
 	cat <<EOF
-Usage: $0 [down|detect|reload|status]
-enables (default), disables or detects a wifi configuration.
+Usage: $0 [config|down|reload|status]
+enables (default), disables or configures devices not yet configured.
 EOF
 	exit 1
 }
@@ -145,8 +145,16 @@ wifi_reload() {
 	wifi_reload_legacy
 }

-wifi_detect() {
-	for driver in ${2:-$DRIVERS}; do (
+wifi_detect_notice() {
+	>&2 echo "WARNING: Wifi detect is deprecated. Use wifi config instead"
+	>&2 echo "For more information, see commit 5f8f8a366136a07df661e31decce2458357c167a"
+	exit 1
+}
+
+wifi_config() {
+	[ ! -f /etc/config/wireless ] && touch /etc/config/wireless
+
+	for driver in $DRIVERS; do (
 		if eval "type detect_$driver" 2>/dev/null >/dev/null; then
 			eval "detect_$driver" || echo "$driver: Detect failed" >&2
 		else
@@ -227,7 +235,8 @@ scan_wifi

 case "$1" in
 	down) wifi_updown "disable" "$2";;
-	detect) wifi_detect "$2";;
+	detect) wifi_detect_notice ;;
+	config) wifi_config ;;
 	status) ubus_wifi_cmd "status" "$2";;
 	reload) wifi_reload "$2";;
 	reload_legacy) wifi_reload_legacy "$2";;
--- a/package/base-files/files/usr/lib/os-release
+++ b/package/base-files/files/usr/lib/os-release
@@ -0,0 +1,18 @@
+NAME="%D"
+VERSION="%V, %N"
+ID="%d"
+ID_LIKE="lede openwrt"
+PRETTY_NAME="%D %N %V"
+VERSION_ID="%v"
+HOME_URL="%m"
+BUG_URL="%b"
+SUPPORT_URL="%s"
+BUILD_ID="%R"
+LEDE_BOARD="%S"
+LEDE_ARCH="%A"
+LEDE_TAINTS="%t"
+LEDE_DEVICE_MANUFACTURER="%M"
+LEDE_DEVICE_MANUFACTURER_URL="%m"
+LEDE_DEVICE_PRODUCT="%P"
+LEDE_DEVICE_REVISION="%h"
+LEDE_RELEASE="%D %N %V %C"
--- a/package/base-files/files/usr/libexec/login.sh
+++ b/package/base-files/files/usr/libexec/login.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ "$(uci get system.@system[0].ttylogin)" == 1 ] || exec /bin/ash --login
+
+exec /bin/login
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -24,13 +24,24 @@ config TARGET_PREINIT_SUPPRESS_STDERR
 		the ash shell launched by inittab will display stderr).  That's
 		the same behaviour as seen in previous version of OpenWrt.

+config TARGET_PREINIT_DISABLE_FAILSAFE
+	bool
+	prompt "Disable failsafe" if PREINITOPT
+	default n
+	help
+		Disable failsafe mode.  While it is very handy while
+		experimenting or developing it really ought to be
+		disabled in production environments as it is a major
+		security loophole.
+
 config TARGET_PREINIT_TIMEOUT
 	int
-	prompt "Failsafe wait timeout" if PREINITOPT
+	prompt "Failsafe/Debug wait timeout" if PREINITOPT
 	default 2
 	help
-		How long to wait for failsafe mode to be entered before
-		continuing with a regular boot if failsafe not selected.
+		How long to wait for failsafe mode to be entered or for
+		a debug option to be pressed before continuing with a
+		regular boot.

 config TARGET_PREINIT_SHOW_NETMSG
 	bool
@@ -45,7 +56,7 @@ config TARGET_PREINIT_SHOW_NETMSG

 config TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG
 	bool
-	prompt "Suppress network message indicating failsafe" if PREINITOPT
+	prompt "Suppress network message indicating failsafe" if ( PREINITOPT && !TARGET_PREINIT_SHOW_NETMSG && !TARGET_PREINIT_DISABLE_FAILSAFE )
 	default n
 	help
 		If "Show all preinit network messages" above is not set, then
@@ -137,17 +148,17 @@ menuconfig VERSIONOPT
 	default n
 	help
 		These options allow to override the version information embedded in
-		the /etc/openwrt_version, /etc/openwrt_release, /etc/banner and
-		/etc/opkg.conf files. Usually there is no need to set these, but
-		they're useful for release builds or custom OpenWrt redistributions
-		that should carry custom version tags.
+		the /etc/openwrt_version, /etc/openwrt_release, /etc/banner,
+		/etc/opkg.conf, and /etc/os-release files. Usually there is no need
+		to set these, but they're useful for release builds or custom OpenWrt
+		redistributions that should carry custom version tags.

 if VERSIONOPT

 	config VERSION_DIST
 		string
 		prompt "Release distribution"
-		default "OpenWrt"
+		default "LEDE"
 		help
 			This is the name of the release distribution.
 			If unspecified, it defaults to OpenWrt.
@@ -164,29 +175,39 @@ if VERSIONOPT
 		prompt "Release version number"
 		help
 			This is the release version number embedded in the image.
-			If unspecified, it defaults to the svn or git-svn revision
-			of the build tree.
+			If unspecified, it defaults to SNAPSHOT for the master branch
+			or to ##.##-SNAPSHOT on release branches.
+
+	config VERSION_CODE
+		string
+		prompt "Release version code"
+		help
+			This is the release version code embedded in the image.
+			If unspecified, it defaults to a revision number describing the
+			repository version of the source, e.g. the number of commits
+			since a branch point or a short Git commit ID.

 	config VERSION_REPO
 		string
 		prompt "Release repository"
-		default "http://downloads.openwrt.org/snapshots/trunk/%S/packages"
+		default "http://downloads.lede-project.org/releases/17.01.3"
 		help
 			This is the repository address embedded in the image, it defaults
 			to the trunk snapshot repo; the url may contain the following placeholders:
-			 %R .. Revision number
-			 %V .. Release version or revision number, uppercase
-			 %v .. Release version or revision number, lowercase
-			 %C .. Release version or "Bleeding Edge", uppercase
-			 %c .. Release version or "bleeding_edge", lowercase
+			 %R .. Repository revision ID
+			 %V .. Configured release version number or "SNAPSHOT", uppercase
+			 %v .. Configured release version number or "snapshot", lowercase
+			 %C .. Configured release revision code or value of %R, uppercase
+			 %c .. Configured release revision code or value of %R, lowercase
 			 %N .. Release name, uppercase
 			 %n .. Release name, lowercase
-			 %D .. Distribution name or "OpenWrt", uppercase
-			 %d .. Distribution name or "openwrt", lowercase
+			 %D .. Distribution name or "Lede", uppercase
+			 %d .. Distribution name or "lede", lowercase
 			 %T .. Target name
 			 %S .. Target/Subtarget name
+			 %A .. Package architecture
 			 %t .. Build taint flags, e.g. "no-all busybox"
-			 %M .. Manufacturer name or "OpenWrt"
+			 %M .. Manufacturer name or "Lede"
 			 %P .. Product name or "Generic"
 			 %h .. Hardware revision or "v0"

@@ -204,6 +225,18 @@ if VERSIONOPT
 			This is an URL to the manufacturer's website embedded in /etc/device_info
 			Useful for OEMs building OpenWrt based firmware

+	config VERSION_BUG_URL
+		string
+		prompt "Bug reporting URL"
+		help
+			This is an URL to provide users for providing bug reports
+
+	config VERSION_SUPPORT_URL
+		string
+		prompt "Support URL"
+		help
+			This an URL to provide users seeking support
+
 	config VERSION_PRODUCT
 		string
 		prompt "Product name"
@@ -225,6 +258,15 @@ if VERSIONOPT
 		help
 			Enable this to include the version number in firmware image, SDK-
 			and Image Builder archive file names
+
+	config VERSION_CODE_FILENAMES
+		bool
+		prompt "Revision code in filenames"
+		default n
+		help
+			Enable this to include the revision identifier or the configured
+			version code into the firmware image, SDK- and Image Builder archive
+			file names
 endif


@@ -244,48 +286,9 @@ menuconfig PER_FEED_REPO

 	config PER_FEED_REPO_ADD_COMMENTED
 		bool "Comment out not enabled feeds"
-		default y
+		default !BUILDBOT
 		depends on PER_FEED_REPO && PER_FEED_REPO_ADD_DISABLED
 		help
 		  Add not enabled feeds as commented out source lines to opkg.conf.

 source "tmp/.config-feeds.in"
-
-
-menuconfig SMIMEOPT
-	bool "Package signing options" if IMAGEOPT
-        default n
-	help
-		These options configure the signing key and certificate to
-		be used for signing and verifying packages.
-
-	config OPKGSMIME_CERT
-		string
-		prompt "Path to certificate (PEM certificate format)" if SMIMEOPT
-		help
-		  Path to the certificate to use for signature verification
-
-	config OPKGSMIME_KEY
-		string
-		prompt "Path to signing key (PEM private key format)" if SMIMEOPT
-		help
-		  Path to the key to use for signing packages
-
-	config OPKGSMIME_PASSPHRASE
-		bool
-		default y
-		prompt "Wait for a passphrase when signing packages?" if SMIMEOPT
-		help
-		  If this value is set, then the build will pause and request a passphrase
-                  from the command line when signing packages. This SHOULD NOT be used with
-                  automatic builds. If this value is not set, a file can be specified from
-                  which the passphrase will be read.
-
-	config OPKGSMIME_PASSFILE
-		string
-		prompt "Path to a file containing the passphrase" if SMIMEOPT
-                depends on !OPKGSMIME_PASSPHRASE
-		help
-		  Path to a file containing the passphrase for the signing key.
-                  If the signing key is not encrypted and does not require a passphrase,
-                  this option may be left blank.
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`# <file system> <mount point> <type> <options> <dump> <pass>`