update for 2010.05-rc2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

CHANGES

@@ -1,3 +1,111 @@
+2010.05-rc2, Released May 11th, 2010:
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: busybox, customize, gawk, gnuchess,
+	hal, hostapd, less, libgcrypt, libnl, libxcb, linux-fusion,
+	ltp-testsuite, mplayer, netplug, pciutils, php, sed,
+	shared-mime-info usb_modeswitch, usbutils, vlc wpa_supplicant,
+	xapp_bdftopcf, xapp_mkfontdir, xdriver_xf86-video-openchrome,
+	xfont_encodings, xlib_libX11, xlib_libXfont, xlib_xtrans,
+	xproto_fontcacheproto, xproto_fontsproto, xvkbd
+
+	Removed packages: vice
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#849: "customize" package copies files to wrong place in target tree
+	#985: Bump usb_modeswitch package to 1.1.0
+	#1135: Package customize. Wrong copying
+	#1525: Package hal deletes a whole <target>/etc/rc.d directory
+	#1531: libxcb 1.5 build fails, due to missing xcbgen Python module
+	#1669: Busybox failed to compile when using an external toolchain
+	#1699: Fix usbutils dependencies and bump
+	#1705: Fix pciutils broken cross compiling
+	#1717: External toolchain fixes for hostapd & wpa_supplicant
+
+2010.05-rc1, Released May 3rd, 2010:
+
+	Cleaned up / restructured package menu.
+
+	Toolchain: uClibc 0.9.30.3 / 0.9.31, older 0.9.30.x removed.
+	2.6.33 kernel headers, binutils 2.20.1, GCC 4.4.4,
+	removed broken nios2 support, ppc e300cX/e500mc support,
+	improved external toolchain support, GDB 7.x support.
+
+	X.org updated to 7.5.
+
+	New packages: cdrkit, cramfs, genext2fs, genromfs,
+	libatomic_ops, librsync, libusb-compat, lmbench, netperf,
+	squashfs, squashfs3, squid
+
+	Updated/fixed packages: alsa-utils, argus, autoconf, bison,
+	busybox, bzip2, directfb, dnsmasq, dosfstools, e2fsprogs,
+	eeprog, fakeroot, fbv, findutils, freetype, haserl, hostapd,
+	iperf, iptables, iw, less, libaio, libcgi, libcgicc, libdrm,
+	libgcrypt, libglib2, libid3tag, libmad, liboil, libosip2,
+	libpng, libraw1394, libsysfs, libxml2, libxslt, linux-fusion,
+	ltrace, lua, lzma, madplay, makedevs, matchbox, mdadm,
+	memstat, mesa3d, mtd-utils, nano, ncurses, openssl, patch,
+	pciutils, php, pixman, portage, pppd, pthread-stubs, python,
+	qt, radvd, samba, setserial, smartmontools, tar, tslib,
+	udpcast, usb_modeswith, vtun, wget, xdata_xcursor-themes,
+	xdriver_xf86-video-intel, xkeyboard-config, xlib_libX11,
+	xlib_libXaw, xlib_libXfont, xlib_libXfontcache,
+	xlib_libXxf86misc, xlib_libXtst, xlib_libpciaccess,
+	xproto_dri2proto, xproto_eviext, xproto_fontcacheproto,
+	xproto_xf86miscproto, xserver_xorg-server
+
+	Removed packages: xapp_xtrap, xlib_libXTrap, xlib_libXevie,
+	xlib_libXxf86misc, xxproto_evieext, proto_trapproto,
+	xproto_xf86miscproto
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#513: Add new squid package
+	#661: lmbench: new package
+	#719: Add lua option to haserl
+	#800: [PATCH] iperf update to 2.0.4
+	#803: [PATCH] lua - add shared library patch and config option for...
+	#805: [PATCH] mdadm - version update
+	#817: integrator926_defconfig uses unsupported uboot board name
+	#851: Add option to specify --sysroot value for external toolchain
+	#1093: Upgrade libusb to v1.0.3 and add new libusb-compat
+               package for compatibility with old packages that expect
+               the pre-1.0 API.
+	#1105: Add new netperf package
+	#1111: Bump wget to 1.12 and migrate to Makefile.autotools.in
+	#1117: Bump nano to 2.2.3 and migrate to Makefile.autotools.in
+	#1123: Bump less to 436 and migrate to Makefile.autotools.in
+	#1129: Bump memstat to 0.8 and migrate to Makefile.package.in
+	#1189: Wrong u-boot configuration name for integrator926 target
+	#1219: kernel headers not correctly installed into toolchain/staging
+	#1267: Wrong BR2_EXTRA_VERSION
+	#1273: BR2_INET_IPV6 does not enable IPv6 in pppd
+	#1303: Add librsync package
+	#1321: Busybox link fails due to lack of --sysroot option
+	#1327: mtd-utils compile failure due to lack of --sysroot in CFLAGS
+	#1345: Bump pppd to 2.4.5 and convert to Makefile.autotools.in
+	#1369: cannot build radvd (flex problem)
+	#1387: xlib_libX11-1.3.2 can't find libjpeg
+	#1411: [SECURITY] Update openssl package to 0.9.8n
+	#1417: Bump iptables to 1.4.7
+	#1423: Bump e2fsprogs to 1.41.11
+	#1429: [SECURITY] Update php to 5.2.13
+	#1441: Add binutils 2.20.1
+	#1447: Package installation on target with debug symbols is broken
+	#1459: Misc QA fixes
+	#1489: radvd update to 1.6
+	#1513: Enable powerpc e300c2, e300c3 and e500mc optimization
+	#1537: dev entries not created anymore
+	#1555: Fix default uclibc-0.9.31 configuration
+	#1561: [SECURITY] Update samba to 3.3.12
+	#1567: openssl0.9.8n fails to compile
+	#1573: Alsa-utils alsactl/init/* not installed to target
+	#1591: portmap fails to compile
+	#1615: Convert eeprog package to gentargets
+	#1645: Bump hostapd package to 0.7.2
+
 2010.02, Release February 26th, 2010:
 
 	Fixes all over the tree.

Config.in

@@ -8,13 +8,15 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
 	string
-	default "2010.02"
+	default "2010.05-rc2
 
 source "target/Config.in.arch"
 source "target/device/Config.in"
 
 menu "Build options"
 
+menu "Commands"
+
 config BR2_WGET
 	string "Wget command"
 	default "wget --passive-ftp -nd"
@@ -67,6 +69,8 @@ config BR2_TAR_OPTIONS
 	  E.g. " -v --exclude='*.svn*'" to exclude all .svn internal files
 	  and to be verbose.
 
+endmenu
+
 config BR2_DL_DIR
 	string "Download dir"
 	default "$(TOPDIR)/dl"
@@ -84,8 +88,6 @@ config BR2_COPYTO
 	  Setting this variable will (eventually) override 
 	  any other copyto configurations in buildroot.
 
-source	"target/device/Config.in.mirrors"
-
 config BR2_STAGING_DIR
 	string "Toolchain and header file location?"
 	default "$(BASE_DIR)/staging"
@@ -99,73 +101,19 @@ config BR2_STAGING_DIR
 	  Most people will leave this set to the default value of
 	  "$(BASE_DIR)/staging".
 
-config BR2_GNU_BUILD_SUFFIX
-	string "GNU build hostname suffix"
-	default "pc-linux-gnu"
-	help
-	  The string used to pass to configure scripts via the
-	  --build= option.  Just specify the suffix here, the leading
-	  arch will be filled in automatically.
-
-	  Here's some copy and paste build host options for you:
-	      linux:   pc-linux-gnu
-	      cygwin:  pc-cygwin
-	      os x:    apple-darwin7 / apple-darwin8
-
-config BR2_GNU_TARGET_SUFFIX
-	string "GNU target suffix"
-	default "linux-uclibcgnueabi" if BR2_ARM_EABI
-	default "linux-uclibc"
-	help
-	  The string used to pass to configure scripts via the
-	  --target= option.  Just specify the suffix here, the leading
-	  arch will be filled in automatically.
-
-	  Most users will want to stick with the default setting, though
-	  other users (most notably ARM EABI) like to add on to this in
-	  order to stay in line with gcc conventions.
-
-	  Default options are:
-	      linux-uclibcgnueabi for ARM EABI
-	      linux-uclibc for the rest
-	      gnuhurd-uclibc for the hurd
+source	"target/device/Config.in.mirrors"
 
 config BR2_JLEVEL
 	int "Number of jobs to run simultaneously"
-	default "1"
+	default "2"
 	help
 	  Number of jobs to run simultaneously
 
-config BR2_PREFER_IMA
-	bool "prefer IMA compiles"
-	help
-	  Where possible, compile package with Inter Module Analysis.
-	  This potentially uses alot of system resources on your compile
-	  host with the benefit of creating smaller binaries for the target.
-
-	  If unsure, say No.
-
-	  WARNING: This is highly experimental at the moment.
-
 config BR2_DEPRECATED
 	bool "Show packages that are deprecated or obsolete"
 	help
 	  This option hides outdated/obsolete versions of packages.
 
-config BR2_RECENT
-	bool "Show packages that are of the latest major version"
-	default y
-	help
-	  This option show recent versions of packages.
-
-config BR2_CONFIG_CACHE
-	bool "Use a central configure cache file"
-	default y
-	help
-	  This determines if a central config cache is used by
-	  packages, reducing the configure time for packages as each
-	  one caches its findings.
-
 config BR2_ENABLE_DEBUG
 	bool "build packages with debugging symbols"
 	select BR2_PACKAGE_GDB_SERVER
@@ -311,24 +259,11 @@ config BR2_PREFER_STATIC_LIB
 
 	  WARNING: This is highly experimental at the moment.
 
-config BR2_HAVE_MANPAGES
-	bool "manpages on the target"
-	help
-	  Leave the manpages on the target.
-	  If you say n here, your target will not contain any
-	  manpage.
-
-config BR2_HAVE_INFOPAGES
-	bool "infopages on the target"
-	help
-	  Leave the infopages on the target.
-	  If you say n here, your target will not contain any
-	  infopage.
-
 config BR2_HAVE_DOCUMENTATION
 	bool "documentation on the target"
 	help
-	  Leave the documentation on the target.
+	  Install the documentation, including manual pages and info
+	  pages, on the target.
 	  If you say n here, your target will not contain any
 	  documentation.
 
@@ -338,7 +273,17 @@ config BR2_HAVE_DEVFILES
 	  Install headers and static libraries in the
 	  target filesystem
 
-source package/gnuconfig/Config.in
+menu "Advanced"
+
+config BR2_CONFIG_CACHE
+	bool "Use a central configure cache file"
+	default y
+	help
+	  This determines if a central config cache is used by
+	  packages, reducing the configure time for packages as each
+	  one caches its findings.
+
+endmenu
 
 endmenu
 
@@ -346,4 +291,6 @@ source "toolchain/Config.in"
 
 source "package/Config.in"
 
+source "fs/Config.in"
+
 source "target/Config.in"

Makefile

@@ -153,29 +153,31 @@ cc-option=$(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev
 unexport CROSS_COMPILE
 unexport ARCH
 
+GNU_HOST_NAME:=$(shell package/gnuconfig/config.guess)
+
 #############################################################
 #
 # Setup the proper filename extensions for the host
 #
 ##############################################################
-ifneq ($(findstring linux,$(BR2_GNU_BUILD_SUFFIX)),)
+ifneq ($(findstring linux,$(GNU_HOST_NAME)),)
 HOST_EXEEXT:=
 HOST_LIBEXT:=.a
 HOST_SHREXT:=.so
 endif
-ifneq ($(findstring apple,$(BR2_GNU_BUILD_SUFFIX)),)
+ifneq ($(findstring apple,$(GNU_HOST_NAME)),)
 HOST_EXEEXT:=
 HOST_LIBEXT:=.a
 HOST_SHREXT:=.dylib
 endif
-ifneq ($(findstring cygwin,$(BR2_GNU_BUILD_SUFFIX)),)
+ifneq ($(findstring cygwin,$(GNU_HOST_NAME)),)
 HOST_EXEEXT:=.exe
 HOST_LIBEXT:=.lib
 HOST_SHREXT:=.dll
 HOST_LOADLIBES="-lcurses -lintl"
 export HOST_LOADLIBES
 endif
-ifneq ($(findstring mingw,$(BR2_GNU_BUILD_SUFFIX)),)
+ifneq ($(findstring mingw,$(GNU_HOST_NAME)),)
 HOST_EXEEXT:=.exe
 HOST_LIBEXT:=.lib
 HOST_SHREXT:=.dll
@@ -199,7 +201,7 @@ PREFERRED_LIB_FLAGS:=--enable-static --enable-shared
 ##############################################################
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers
-else
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
 BASE_TARGETS:=uclibc
 endif
 TARGETS:=
@@ -212,6 +214,7 @@ ARCH:=$(call qstrip,$(BR2_ARCH))
 ifeq ($(ARCH),xtensa)
 ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name))
 endif
+
 WGET:=$(call qstrip,$(BR2_WGET)) $(SPIDER) $(QUIET)
 SVN_CO:=$(call qstrip,$(BR2_SVN_CO)) $(QUIET)
 SVN_UP:=$(call qstrip,$(BR2_SVN_UP)) $(QUIET)
@@ -230,6 +233,12 @@ else
 # forwards command line variable definitions those packages get very
 # confused. Fix this by telling make to not do so
 MAKEOVERRIDES =
+# strangely enough O is still passed to submakes with MAKEOVERRIDES
+# (with make 3.81 atleast), the only thing that changes is the output
+# of the origin function (command line -> environment).
+# Unfortunately some packages don't look at origin (E.G. uClibc 0.9.31+)
+# To really make O go away, we have to override it.
+override O:=$(O)
 endif
 
 # bash prints the name of the directory on 'cd <dir>' if CDPATH is
@@ -259,13 +268,7 @@ STAMP_DIR:=$(BASE_DIR)/stamps
 
 BINARIES_DIR:=$(BASE_DIR)/images
 TARGET_DIR:=$(BASE_DIR)/target
-
-# define values for prepatched source trees for toolchains
-VENDOR_SITE:=$(call qstrip,$(BR2_VENDOR_SITE))
-VENDOR_BINUTILS_RELEASE:=$(call qstrip,$(BR2_VENDOR_BINUTILS_RELEASE))
-VENDOR_GCC_RELEASE:=$(call qstrip,$(BR2_VENDOR_GCC_RELEASE))
-VENDOR_UCLIBC_RELEASE:=$(call qstrip,$(BR2_VENDOR_UCLIBC_RELEASE))
-VENDOR_PATCH_DIR:=$(call qstrip,$(BR2_VENDOR_PATCH_DIR))
+TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 
 BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config
 
@@ -301,7 +304,7 @@ include toolchain/kernel-headers/kernel-headers.mk
 include toolchain/mklibs/mklibs.mk
 include toolchain/sstrip/sstrip.mk
 include toolchain/uClibc/uclibc.mk
-else
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
 include toolchain/*/*.mk
 endif
 
@@ -317,6 +320,8 @@ ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
 TARGETS+=target-purgelocales
 endif
 
+include fs/common.mk
+
 # target stuff is last so it can override anything else
 include target/Makefile.in
 
@@ -363,7 +368,7 @@ $(STAGING_DIR):
 ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
 	@mkdir -p $(STAGING_DIR)/usr/lib
 else
-ifneq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 	@ln -snf . $(STAGING_DIR)/usr
 	@mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)
 	@ln -snf ../lib $(STAGING_DIR)/usr/lib
@@ -401,11 +406,11 @@ else
 	find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
 	find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
 endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 	rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/man
-endif
-ifneq ($(BR2_HAVE_INFOPAGES),y)
 	rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info
+	rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc
+	rm -rf $(TARGET_DIR)/usr/share/gtk-doc
 endif
 	find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
 	$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null

configs/arm_toolchain_defconfig

@@ -161,13 +161,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 BR2_CONFIG_CACHE=y
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -179,11 +174,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -282,7 +274,6 @@ BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 BR2_USE_WCHAR=y
 # BR2_SOFT_FLOAT is not set
 # BR2_PTHREADS_NONE is not set
@@ -721,6 +712,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/generic/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set

configs/at91rm9200df_defconfig

@@ -166,13 +166,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9260dfc"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -184,11 +179,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -297,7 +289,6 @@ BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 BR2_USE_WCHAR=y
 # BR2_SOFT_FLOAT is not set
 # BR2_PTHREADS_NONE is not set
@@ -353,7 +344,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -847,6 +837,7 @@ BR2_PACKAGE_LIBXML2=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -854,12 +845,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot"
+
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -876,8 +867,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot"
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/at91rm9200df_ext_bare_defconfig

@@ -161,13 +161,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91rm9200df-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -179,11 +174,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -641,6 +633,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set

configs/at91rm9200df_ext_defconfig

@@ -172,13 +172,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91rm9200df-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -190,11 +185,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -278,7 +270,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -772,6 +763,7 @@ BR2_PACKAGE_LIBXML2=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -779,12 +771,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot"
+
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -801,8 +793,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot"
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/at91sam9260dfc_defconfig

@@ -179,13 +179,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -197,11 +192,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -238,7 +230,6 @@ BR2_UCLIBC_VERSION_0_9_30=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
 BR2_PTHREADS_OLD=y
@@ -365,7 +356,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -861,6 +851,7 @@ BR2_PACKAGE_LIBXML2=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -868,12 +859,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot"
+
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -890,8 +881,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot"
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/at91sam9260dfc_ext_bare_defconfig

@@ -161,13 +161,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -179,11 +174,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -641,6 +633,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set

configs/at91sam9260dfc_ext_defconfig

@@ -180,13 +180,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -198,11 +193,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -286,7 +278,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -780,6 +771,7 @@ BR2_PACKAGE_LIBXML2=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -787,12 +779,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot"
+
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -809,8 +801,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot"
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/at91sam9260pf_defconfig

@@ -52,7 +52,6 @@ BR2_ENDIAN="LITTLE"
 #
 # Build options
 #
-# BR2_UPDATE_CONFIG is not set
 BR2_WGET="wget --passive-ftp"
 BR2_SVN="svn co"
 BR2_ZCAT="gzip -d -c"
@@ -73,10 +72,7 @@ BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
 BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX="wchar"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
@@ -275,7 +271,6 @@ BR2_PACKAGE_DISTCC=y
 BR2_PACKAGE_DMALLOC=y
 BR2_PACKAGE_EXPAT=y
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -552,6 +547,7 @@ BR2_SCRIPTING_SUPPORT=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -559,12 +555,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO=""
+
 # BR2_TARGET_ROOTFS_JFFS2 is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/at91sam9261ek_defconfig

@@ -182,13 +182,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9261ek-NAND"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 BR2_CONFIG_CACHE=y
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -200,11 +195,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -241,7 +233,6 @@ BR2_UCLIBC_VERSION_0_9_30=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
 BR2_PTHREADS_OLD=y
@@ -359,7 +350,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -912,6 +902,7 @@ BR2_PACKAGE_LIBXSLT=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -919,12 +910,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO=""
+
 BR2_TARGET_ROOTFS_JFFS2=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -942,8 +933,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/at91sam9261ek_ext_bare_defconfig

@@ -164,13 +164,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9261ek-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -182,11 +177,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -644,6 +636,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set

configs/at91sam9261ek_ext_defconfig

@@ -183,13 +183,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9261ek-NAND"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 BR2_CONFIG_CACHE=y
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -201,11 +196,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -317,7 +309,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -868,6 +859,7 @@ BR2_PACKAGE_LIBXSLT=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -875,12 +867,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO=""
+
 BR2_TARGET_ROOTFS_JFFS2=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -898,8 +890,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/at91sam9263ek_defconfig

@@ -180,13 +180,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9263ek-NAND"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 BR2_CONFIG_CACHE=y
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -198,11 +193,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -302,7 +294,6 @@ BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 BR2_USE_WCHAR=y
 # BR2_SOFT_FLOAT is not set
 # BR2_PTHREADS_NONE is not set
@@ -358,7 +349,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -909,6 +899,7 @@ BR2_PACKAGE_LIBXSLT=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -916,12 +907,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO=""
+
 BR2_TARGET_ROOTFS_JFFS2=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -939,8 +930,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/at91sam9263ek_ext_bare_defconfig

@@ -163,13 +163,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9263ek-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -181,11 +176,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -643,6 +635,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set

configs/at91sam9263ek_ext_defconfig

@@ -182,13 +182,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9263ek-NAND"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 BR2_CONFIG_CACHE=y
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -200,11 +195,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -279,7 +271,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -830,6 +821,7 @@ BR2_PACKAGE_LIBXSLT=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -837,12 +829,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO=""
+
 BR2_TARGET_ROOTFS_JFFS2=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -860,8 +852,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/at91sam9g20dfc_defconfig

@@ -180,13 +180,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam92g20ek-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -198,11 +193,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -302,7 +294,6 @@ BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 BR2_USE_WCHAR=y
 # BR2_SOFT_FLOAT is not set
 # BR2_PTHREADS_NONE is not set
@@ -358,7 +349,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -777,6 +767,7 @@ BR2_PACKAGE_EXPAT=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -784,12 +775,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot"
+
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -806,8 +797,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot"
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/at91sam9g20dfc_ext_bare_defconfig

@@ -161,13 +161,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9g20dfc-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -179,11 +174,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -641,6 +633,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set

configs/at91sam9g20dfc_ext_defconfig

@@ -180,13 +180,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9g20dfc-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -198,11 +193,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -286,7 +278,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -780,6 +771,7 @@ BR2_PACKAGE_LIBXML2=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/root/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -787,12 +779,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot"
+
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
@@ -809,8 +801,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot"
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/atngw100-base_defconfig

@@ -113,12 +113,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -130,11 +126,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -275,7 +268,6 @@ BR2_PACKAGE_BUSYBOX_SKELETON=y
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_GETTEXT is not set
 # BR2_PACKAGE_LIBINTL is not set
 # BR2_PACKAGE_LIBGMP is not set
@@ -700,11 +692,11 @@ BR2_PACKAGE_ZLIB=y
 # Target filesystem options
 #
 BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
 
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/atngw100-base/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set
@@ -724,8 +716,8 @@ BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x0
 # BR2_TARGET_ROOTFS_JFFS2_LE is not set
 BR2_TARGET_ROOTFS_JFFS2_BE=y
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 BR2_TARGET_ROOTFS_TAR=y
@@ -734,7 +726,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
 # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
 # BR2_TARGET_ROOTFS_TAR_LZMA is not set
 BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-BR2_TARGET_ROOTFS_TAR_COPYTO=""
+
 # BR2_TARGET_ROOTFS_CPIO is not set
 # BR2_TARGET_ROOTFS_INITRAMFS is not set
 # BR2_TARGET_ROOTFS_ROMFS is not set

configs/atngw100_defconfig

@@ -113,12 +113,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=3
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 BR2_CONFIG_CACHE=y
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -130,11 +126,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -236,7 +229,6 @@ BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 # BR2_ENABLE_LOCALE_PURGE is not set
 BR2_USE_WCHAR=y
 BR2_SOFT_FLOAT=y
@@ -286,7 +278,6 @@ BR2_PACKAGE_BUSYBOX_SKELETON=y
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 BR2_PACKAGE_LIBINTL=y
 # BR2_PACKAGE_LIBGMP is not set
@@ -691,11 +682,11 @@ BR2_PACKAGE_ZLIB=y
 # Target filesystem options
 #
 BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
 
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/atngw100/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set
@@ -714,8 +705,8 @@ BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
 # BR2_TARGET_ROOTFS_JFFS2_LE is not set
 BR2_TARGET_ROOTFS_JFFS2_BE=y
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot"
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 BR2_TARGET_ROOTFS_TAR=y
@@ -724,7 +715,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
 # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
 # BR2_TARGET_ROOTFS_TAR_LZMA is not set
 BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-BR2_TARGET_ROOTFS_TAR_COPYTO=""
+
 # BR2_TARGET_ROOTFS_CPIO is not set
 # BR2_TARGET_ROOTFS_INITRAMFS is not set
 # BR2_TARGET_ROOTFS_ROMFS is not set

configs/atstk1005_defconfig

@@ -112,13 +112,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -130,11 +125,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -243,7 +235,6 @@ BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 BR2_USE_WCHAR=y
 BR2_SOFT_FLOAT=y
 # BR2_PTHREADS_NONE is not set
@@ -297,7 +288,6 @@ BR2_PACKAGE_BUSYBOX_SKELETON=y
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 BR2_PACKAGE_LIBINTL=y
 # BR2_PACKAGE_LIBGMP is not set
@@ -739,6 +729,7 @@ BR2_PACKAGE_ZLIB=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/atstk1005/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set
@@ -758,8 +749,8 @@ BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
 BR2_TARGET_ROOTFS_JFFS2_BE=y
 # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot"
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 BR2_TARGET_ROOTFS_TAR=y
@@ -768,7 +759,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
 # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
 # BR2_TARGET_ROOTFS_TAR_LZMA is not set
 BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-BR2_TARGET_ROOTFS_TAR_COPYTO=""
+
 # BR2_TARGET_ROOTFS_CPIO is not set
 # BR2_TARGET_ROOTFS_INITRAMFS is not set
 # BR2_TARGET_ROOTFS_ROMFS is not set

configs/atstk100x_defconfig

@@ -112,12 +112,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -129,11 +125,8 @@ BR2_OPTIMIZE_2=y
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_S is not set
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -237,7 +230,6 @@ BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 # BR2_ENABLE_LOCALE_PURGE is not set
 BR2_USE_WCHAR=y
 BR2_SOFT_FLOAT=y
@@ -297,7 +289,6 @@ BR2_PACKAGE_BZIP2=y
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 BR2_PACKAGE_LIBINTL=y
 # BR2_PACKAGE_LIBGMP is not set
@@ -837,11 +828,11 @@ BR2_PACKAGE_ZLIB=y
 # Target filesystem options
 #
 BR2_ROOTFS_PREFIX="atstk1002-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
 
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/atstk100x/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_EXT2=y
@@ -849,12 +840,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 # BR2_TARGET_ROOTFS_EXT2_NONE is not set
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 BR2_TARGET_ROOTFS_EXT2_BZIP2=y
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot"
+
 # BR2_TARGET_ROOTFS_JFFS2 is not set
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
@@ -864,7 +855,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
 # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
 # BR2_TARGET_ROOTFS_TAR_LZMA is not set
 BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-BR2_TARGET_ROOTFS_TAR_COPYTO=""
+
 # BR2_TARGET_ROOTFS_CPIO is not set
 # BR2_TARGET_ROOTFS_INITRAMFS is not set
 # BR2_TARGET_ROOTFS_ROMFS is not set

configs/i386_defconfig

@@ -113,12 +113,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -130,11 +126,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -236,7 +229,6 @@ BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 # BR2_ENABLE_LOCALE_PURGE is not set
 BR2_USE_WCHAR=y
 # BR2_USE_SSP is not set
@@ -285,7 +277,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_GETTEXT is not set
 # BR2_PACKAGE_LIBINTL is not set
 # BR2_PACKAGE_LIBGMP is not set
@@ -679,7 +670,6 @@ BR2_PACKAGE_ZLIB=y
 # Target filesystem options
 #
 BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX=""
 
 #
 # filesystem for target device
@@ -702,8 +692,8 @@ BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000
 BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/i686_defconfig

@@ -113,12 +113,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -130,11 +126,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -236,7 +229,6 @@ BR2_LARGEFILE=y
 BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 # BR2_ENABLE_LOCALE_PURGE is not set
 BR2_USE_WCHAR=y
 # BR2_USE_SSP is not set
@@ -285,7 +277,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_GETTEXT is not set
 # BR2_PACKAGE_LIBINTL is not set
 # BR2_PACKAGE_LIBGMP is not set
@@ -679,7 +670,6 @@ BR2_PACKAGE_ZLIB=y
 # Target filesystem options
 #
 BR2_ROOTFS_PREFIX="i686-rootfs"
-BR2_ROOTFS_SUFFIX=""
 
 #
 # filesystem for target device
@@ -702,8 +692,8 @@ BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000
 BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
+
+
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 # BR2_TARGET_ROOTFS_TAR is not set

configs/integrator926_defconfig

@@ -110,13 +110,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
 BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -128,11 +123,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -282,7 +274,6 @@ BR2_PACKAGE_BUSYBOX_SKELETON=y
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_GETTEXT is not set
 # BR2_PACKAGE_LIBINTL is not set
 # BR2_PACKAGE_LIBGMP is not set
@@ -688,12 +679,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO=""
+
 # BR2_TARGET_ROOTFS_JFFS2 is not set
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
@@ -703,7 +694,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
 # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
 # BR2_TARGET_ROOTFS_TAR_LZMA is not set
 BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-BR2_TARGET_ROOTFS_TAR_COPYTO=""
+
 # BR2_TARGET_ROOTFS_CPIO is not set
 # BR2_TARGET_ROOTFS_INITRAMFS is not set
 # BR2_TARGET_ROOTFS_ROMFS is not set
@@ -712,7 +703,7 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
 # bootloader for target device
 #
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
+BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
 # BR2_TARGET_UBOOT_1_3_4 is not set

configs/integrator926_huge_defconfig

@@ -110,13 +110,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="$(BOARD_NAME)-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
 BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
@@ -128,11 +123,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -286,7 +278,6 @@ BR2_PACKAGE_BISON=y
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 # BR2_PACKAGE_GETTEXT_STATIC is not set
 BR2_PACKAGE_LIBINTL=y
@@ -665,12 +656,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_SQUASH=y
-BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+
 BR2_TARGET_ROOTFS_EXT2_NONE=y
 # BR2_TARGET_ROOTFS_EXT2_GZIP is not set
 # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
 # BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-BR2_TARGET_ROOTFS_EXT2_COPYTO=""
+
 # BR2_TARGET_ROOTFS_JFFS2 is not set
 # BR2_TARGET_ROOTFS_UBIFS is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
@@ -680,7 +671,7 @@ BR2_TARGET_ROOTFS_CPIO_NONE=y
 # BR2_TARGET_ROOTFS_CPIO_GZIP is not set
 # BR2_TARGET_ROOTFS_CPIO_BZIP2 is not set
 # BR2_TARGET_ROOTFS_CPIO_LZMA is not set
-BR2_TARGET_ROOTFS_CPIO_COPYTO=""
+
 # BR2_TARGET_ROOTFS_INITRAMFS is not set
 # BR2_TARGET_ROOTFS_ROMFS is not set
 
@@ -688,7 +679,7 @@ BR2_TARGET_ROOTFS_CPIO_COPYTO=""
 # bootloader for target device
 #
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
+BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
 # BR2_TARGET_UBOOT_1_3_4 is not set

configs/kb9202_defconfig

@@ -118,13 +118,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
@@ -135,10 +130,7 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -286,7 +278,6 @@ BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_GETTEXT is not set
 # BR2_PACKAGE_LIBINTL is not set
 # BR2_PACKAGE_LIBGMP is not set
@@ -661,6 +652,7 @@ BR2_GAMES=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/KwikByte/kb9202/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set
@@ -673,7 +665,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
 # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
 # BR2_TARGET_ROOTFS_TAR_LZMA is not set
 BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-BR2_TARGET_ROOTFS_TAR_COPYTO=""
+
 # BR2_TARGET_ROOTFS_CPIO is not set
 # BR2_TARGET_ROOTFS_INITRAMFS is not set
 # BR2_TARGET_ROOTFS_ROMFS is not set

configs/v100sc2_defconfig

@@ -89,13 +89,8 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
-BR2_RECENT=y
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
@@ -106,11 +101,8 @@ BR2_STRIP_strip=y
 # BR2_OPTIMIZE_3 is not set
 BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
 # BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
 
 #
 # Toolchain
@@ -267,7 +259,6 @@ BR2_PACKAGE_BASH=y
 # BR2_PACKAGE_DISTCC is not set
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 BR2_PACKAGE_LIBINTL=y
 # BR2_PACKAGE_LIBGMP is not set
@@ -692,6 +683,7 @@ BR2_PACKAGE_LIBXSLT=y
 #
 # filesystem for target device
 #
+BR2_ROOTFS_DEVICE_TABLE="target/device/valka/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set
@@ -704,7 +696,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
 # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
 # BR2_TARGET_ROOTFS_TAR_LZMA is not set
 BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-BR2_TARGET_ROOTFS_TAR_COPYTO=""
+
 # BR2_TARGET_ROOTFS_CPIO is not set
 # BR2_TARGET_ROOTFS_INITRAMFS is not set
 # BR2_TARGET_ROOTFS_ROMFS is not set

docs/buildroot.html

@@ -661,16 +661,6 @@ endif
 	<code>$(BOARD_PATH)/target_skeleton</code> so that the target
 	skeleton is stored in the board specific directory.</li>
 
-	<li><code>TARGET_DEVICE_TABLE</code> to a file that contains
-	the target device table &mdash; the list of device files (in
-	<code>/dev/</code>) to be created by the root filesystem build
-	procedure. If this variable is defined, the given device table
-	will be used instead of the default one. If defined, the
-	convention is to define it to
-	<code>$(BOARD_PATH)/target_device_table.txt</code>. See
-	<code>target/generic/device_table.txt</code> for an example
-	file.</li>
-
       </ul>
 
       </li>

docs/download.html

@@ -13,15 +13,15 @@ here:<p>
 or
 <a href="/downloads/buildroot-2010.02.tar.bz2">buildroot-2010.02.tar.bz2</a>.
 <p>
-<!--
-The latest release candidate is <b>2010.02-rc2</b>, which can be
+
+The latest release candidate is <b>2010.05-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2010.02-rc2.tar.gz">buildroot-2010.02-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2010.05-rc2.tar.gz">buildroot-2010.05-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2010.02-rc2.tar.bz2">buildroot-2010.02-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2010.05-rc2.tar.bz2">buildroot-2010.05-rc2.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 

docs/news.html

@@ -5,6 +5,38 @@
 <p>
 
 <ul>
+  <li><b>11 May 2010 -- 2010.05-rc2 released</b>
+
+    <p>Another week, another release candidate with a bunch of
+    cleanups and build fixes.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2010.05-rc2.tar.bz2">2010.05-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>3 May 2010 -- 2010.05-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2010.05_rc1">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2010.05-rc1.tar.bz2">2010.05-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>2 May 2010 - FOSDEM slides online</b>
+
+    <p>The slides from the <a
+    href="http://fosdem.org/2010/schedule/events/emb_cross_build">Cross
+    Build Systems: Present & Future</a> session at <a
+    href="http://fosdem.org/2010">FOSDEM</a> are now <a
+    href="http://send-patches.org/news/20100211-1-FOSDEM-Crossdev-Workshop.pdf">online</a>.
+
   <li><b>26 February 2010 -- 2010.02 released</b>
 
     <p>The stable 2010.02 release is out - Thanks to everyone

fs/Config.in

@@ -0,0 +1,38 @@
+menu "Target filesystem options"
+
+config BR2_ROOTFS_POST_BUILD_SCRIPT
+	string "Custom script to run before packing files"
+	default ""
+	help
+	  Specify a script to be run after the build has finished and before
+	  the BR2 starts packing the files into selected packages.
+
+	  This gives users the oportunity to do board-specific cleanups,
+	  add-ons and the like, so the generated files can be used directly
+	  without further processing.
+
+	  The script is called with the target directory name as first and
+	  only argument. Make sure the exit code of that script is 0,
+	  otherwise make will stop after calling it.
+
+config BR2_ROOTFS_DEVICE_TABLE
+       string "Path to the device table"
+       default "target/generic/device_table.txt"
+       help
+         Specify the location of a device table, that will be passed
+         to the makedevs utility to create all the special device
+         files in the target filesystem.
+
+source "fs/cramfs/Config.in"
+source "fs/cloop/Config.in"
+source "fs/ext2/Config.in"
+source "fs/jffs2/Config.in"
+source "fs/ubifs/Config.in"
+source "fs/squashfs/Config.in"
+source "fs/tar/Config.in"
+source "fs/cpio/Config.in"
+source "fs/iso9660/Config.in"
+source "fs/initramfs/Config.in"
+source "fs/romfs/Config.in"
+
+endmenu

fs/cloop/cloop.mk

@@ -0,0 +1,13 @@
+#############################################################
+#
+# Build the compressed loop root filesystem image
+#
+#############################################################
+
+ROOTFS_CLOOP_DEPENDENCIES = host-cloop host-cdrkit
+
+define ROOTFS_CLOOP_CMD
+	$(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | $(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $$@
+endef
+
+$(eval $(call ROOTFS_TARGET,cloop))

fs/common.mk

@@ -0,0 +1,71 @@
+#
+# Macro that builds the needed Makefile target to create a root
+# filesystem image.
+#
+# The following variable must be defined before calling this macro
+#
+#  ROOTFS_$(FSTYPE)_CMD, the command that generates the root
+#  filesystem image. A single command is allowed. The filename of the
+#  filesystem image that it must generate is $$@.
+#
+# The following variables can optionaly be defined
+#
+#  ROOTFS_$(FSTYPE)_DEPENDENCIES, the list of dependencies needed to
+#  build the root filesystem (usually host tools)
+#
+#  ROOTFS_$(FSTYPE)_PRE_GEN_HOOKS, a list of hooks to call before
+#  generating the filesystem image
+#
+#  ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after
+#  generating the filesystem image
+#
+# In terms of configuration option, this macro assumes that the
+# BR2_TARGET_ROOTFS_$(FSTYPE) config option allows to enable/disable
+# the generation of a filesystem image of a particular type. If
+# configura options BR2_TARGET_ROOTFS_$(FSTYPE)_GZIP,
+# BR2_TARGET_ROOTFS_$(FSTYPE)_BZIP2 or
+# BR2_TARGET_ROOTFS_$(FSTYPE)_LZMA exist and are enabled, then the
+# macro will automatically generate a compressed filesystem image.
+
+FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs
+ROOTFS_DEVICE_TABLE = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE))
+
+define ROOTFS_TARGET_INTERNAL
+
+$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
+	@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
+	$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
+	rm -f $(FAKEROOT_SCRIPT)
+	touch $(BUILD_DIR)/.fakeroot.00000
+	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
+	echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
+ifneq ($(ROOTFS_DEVICE_TABLE),)
+	echo "$(HOST_DIR)/usr/bin/makedevs -d $(ROOTFS_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
+endif
+	echo "$(ROOTFS_$(2)_CMD)" >> $(FAKEROOT_SCRIPT)
+	chmod a+x $(FAKEROOT_SCRIPT)
+	$(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT)
+	-@rm -f $(FAKEROOT_SCRIPT)
+	$(foreach hook,$(ROOTFS_$(2)_POST_GEN_HOOKS),$(call $(hook))$(sep))
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
+	gzip -9 -c $$@ > $$@.gz
+endif
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_BZIP2),y)
+	bzip2 -9 -c $$@ > $$@.bz2
+endif
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZMA),y)
+	$(LZMA) -9 -c $$@ > $$@.lzma
+endif
+
+$(1)-root: $(BINARIES_DIR)/rootfs.$(1)
+
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
+TARGETS += $(1)-root
+endif
+endef
+
+define ROOTFS_TARGET
+$(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
+endef
+
+include fs/*/*.mk

fs/cpio/Config.in

@@ -1,6 +1,5 @@
 config BR2_TARGET_ROOTFS_CPIO
 	bool "cpio the root filesystem"
-	select BR2_HOST_FAKEROOT
 	help
 	  Build a cpio archive of the root filesystem
 
@@ -20,31 +19,16 @@ config BR2_TARGET_ROOTFS_CPIO_GZIP
         bool "gzip"
         help
          Do compress the cpio filesystem with gzip.
-         Note that you either have to have gzip installed on your host
-         or select to build a gzip for your host. See the packages submenu.
 
 config BR2_TARGET_ROOTFS_CPIO_BZIP2
         bool "bzip2"
         help
          Do compress the cpio filesystem with bzip2.
-         Note that you either have to have bzip2 installed on your host
-         or select to build a bzip2 for your host. See the packages submenu.
 
 config BR2_TARGET_ROOTFS_CPIO_LZMA
         bool "lzma"
         help
          Do compress the cpio filesystem with lzma.
-         Note that you either have to have lzma installed on your host
-         or select to build a lzma for your host. See the packages submenu.
 
 endchoice
 
-config BR2_TARGET_ROOTFS_CPIO_COPYTO
-	string "also copy the image to..."
-	depends on BR2_TARGET_ROOTFS_CPIO
-	default ""
-	help
-	  Copies the resulting image to a secondary location
-	  like a tftp server's root directory.
-	
-	  Example: $(IMAGE)-$(DATE).cpio$(CPIO_ROOTFS_COMPRESSOR_EXT)

fs/cpio/cpio.mk

@@ -0,0 +1,18 @@
+#############################################################
+#
+# cpio to archive target filesystem
+#
+#############################################################
+
+define ROOTFS_CPIO_INIT_SYMLINK
+	rm -f $(TARGET_DIR)/init
+	ln -s sbin/init $(TARGET_DIR)/init
+endef
+
+ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_INIT_SYMLINK
+
+define ROOTFS_CPIO_CMD
+	cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $$@
+endef
+
+$(eval $(call ROOTFS_TARGET,cpio))

fs/cramfs/Config.in

@@ -1,6 +1,5 @@
 config BR2_TARGET_ROOTFS_CRAMFS
 	bool "cramfs root filesystem"
-	select BR2_HOST_FAKEROOT
 	help
 	  Build a cramfs root filesystem
 

fs/cramfs/cramfs.mk

@@ -0,0 +1,22 @@
+#############################################################
+#
+# Build the cramfs root filesystem image
+#
+#############################################################
+ifeq ($(BR2_ENDIAN),"BIG")
+CRAMFS_OPTS=-b
+else
+CRAMFS_OPTS=-l
+endif
+
+ifneq ($(ROOTFS_DEVICE_TABLE),)
+CRAMFS_OPTS += -D $(ROOTFS_DEVICE_TABLE)
+endif
+
+define ROOTFS_CRAMFS_CMD
+ $(HOST_DIR)/usr/bin/mkcramfs -q $(CRAMFS_OPTS) $(TARGET_DIR) $$@
+endef
+
+ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs
+
+$(eval $(call ROOTFS_TARGET,cramfs))

fs/ext2/Config.in

@@ -1,7 +1,6 @@
 config BR2_TARGET_ROOTFS_EXT2
 	bool "ext2 root filesystem"
 	default y
-	select BR2_HOST_FAKEROOT
 	help
 	  Build an ext2 root filesystem
 
@@ -25,11 +24,6 @@ config BR2_TARGET_ROOTFS_EXT2_SQUASH
 	depends on  BR2_TARGET_ROOTFS_EXT2
 	default y
 
-config BR2_TARGET_ROOTFS_EXT2_OUTPUT
-	string "Output File"
-	depends on BR2_TARGET_ROOTFS_EXT2
-	default "$(IMAGE).ext2"
-
 choice
 	prompt "Compression method"
 	default BR2_TARGET_ROOTFS_EXT2_NONE
@@ -46,30 +40,16 @@ config BR2_TARGET_ROOTFS_EXT2_GZIP
 	bool "gzip"
 	help
 	  Do compress the ext2 filesystem with gzip.
-	  Note that you either have to have gzip installed on your host
-	  or select to build a gzip for your host. See the packages submenu.
 
 config BR2_TARGET_ROOTFS_EXT2_BZIP2
 	bool "bzip2"
 	help
 	  Do compress the ext2 filesystem with bzip2.
-	  Note that you either have to have bzip2 installed on your host
-	  or select to build a bzip2 for your host. See the packages submenu.
 
 config BR2_TARGET_ROOTFS_EXT2_LZMA
 	bool "lzma"
 	help
 	  Do compress the ext2 filesystem with lzma.
-	  Note that you either have to have lzma installed on your host
-	  or select to build a lzma for your host. See the packages submenu.
 
 endchoice
 
-config BR2_TARGET_ROOTFS_EXT2_COPYTO
-	string "also copy the image to..."
-	depends on BR2_TARGET_ROOTFS_EXT2
-	default ""
-	help
-	  Copies the resulting image to a secondary location
-	  like a tftp server's root directory.
-

fs/ext2/ext2.mk

@@ -0,0 +1,31 @@
+#############################################################
+#
+# Build the ext2 root filesystem image
+#
+#############################################################
+
+EXT2_OPTS :=
+
+ifeq ($(BR2_TARGET_ROOTFS_EXT2_SQUASH),y)
+EXT2_OPTS += -U
+endif
+
+ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
+EXT2_OPTS += -b $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)
+endif
+
+ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0)
+EXT2_OPTS += -N $(BR2_TARGET_ROOTFS_EXT2_INODES)
+endif
+
+ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),0)
+EXT2_OPTS += -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)
+endif
+
+ROOTFS_EXT2_DEPENDENCIES = host-genext2fs
+
+define ROOTFS_EXT2_CMD
+	PATH=$(TARGET_PATH) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $$@
+endef
+
+$(eval $(call ROOTFS_TARGET,ext2))

fs/ext2/genext2fs.sh

@@ -0,0 +1,39 @@
+#!/bin/sh
+# genext2fs wrapper calculating needed blocks/inodes values if not specified
+
+export LC_ALL=C
+
+CALC_BLOCKS=1
+CALC_INODES=1
+
+while getopts x:d:D:b:i:N:m:g:e:zfqUPhVv f
+do
+    case $f in
+	b) CALC_BLOCKS=0 ;;
+	N) CALC_INODES=0 ;;
+	d) TARGET_DIR=$OPTARG ;;
+    esac
+done
+
+# calculate needed blocks
+if [ $CALC_BLOCKS -eq 1 ];
+then
+    BLOCKS=$(du -s -c -k $TARGET_DIR | grep total | sed -e "s/total//")
+    if [ $BLOCKS -ge 20000 ];
+    then
+	BLOCKS=$(expr $BLOCKS + 16384)
+    else
+	BLOCKS=$(expr $BLOCKS + 2400)
+    fi
+    set -- $@ -b $BLOCKS
+fi
+
+# calculate needed inodes
+if [ $CALC_INODES -eq 1 ];
+then
+    INODES=$(find $TARGET_DIR | wc -l)
+    INODES=$(expr $INODES + 400)
+    set -- $@ -N $INODES
+fi
+
+exec genext2fs $@

fs/initramfs/initramfs.mk

@@ -0,0 +1,26 @@
+#############################################################
+#
+# Make a initramfs_list file to be used by gen_init_cpio
+# gen_init_cpio is part of the 2.6 linux kernels to build an
+# initial ramdisk filesystem based on cpio
+#
+#############################################################
+
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+INITRAMFS_TARGET:=initramfs-root
+else
+INITRAMFS_TARGET:= #nothing
+endif
+
+define ROOTFS_INITRAMFS_INIT_SYMLINK
+	rm -f $(TARGET_DIR)/init
+	ln -s sbin/init $(TARGET_DIR)/init
+endef
+
+ROOTFS_INITRAMFS_PRE_GEN_HOOKS += ROOTFS_INITRAMFS_INIT_SYMLINK
+
+define ROOTFS_INITRAMFS_CMD
+	$(SHELL) fs/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $$@
+endef
+
+$(eval $(call ROOTFS_TARGET,initramfs))

fs/iso9660/Config.in

@@ -4,19 +4,13 @@ config BR2_TARGET_ROOTFS_ISO9660
 	depends on !BR2_KERNEL_none
 	select BR2_TARGET_ROOTFS_EXT2
 	select BR2_TARGET_GRUB
-	select BR2_HOST_FAKEROOT
 	help
 	  Build a bootable iso9660 image
 
-config BR2_TARGET_ROOTFS_ISO9660_OUTPUT
-	string "Output File"
-	depends on BR2_TARGET_ROOTFS_ISO9660
-	default "$(IMAGE).iso"
-
 config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
 	string "Boot menu.lst file"
 	depends on BR2_TARGET_ROOTFS_ISO9660
-	default "target/iso9660/menu.lst"
+	default "fs/iso9660/menu.lst"
 
 comment "iso image requires a Linux kernel to be built"
 	depends on BR2_i386 && BR2_KERNEL_none

fs/iso9660/iso9660.mk

@@ -0,0 +1,49 @@
+#############################################################
+#
+# Build the iso96600 root filesystem image
+#
+# Cannot be converted to the ROOTFS_TARGET infrastructure, because of
+# the temporary construction in ISO9660_TARGET_DIR.
+#
+#############################################################
+
+ISO9660_TARGET_DIR=$(BUILD_DIR)/iso9660
+ISO9660_BOOT_MENU:=$(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
+ISO9660_OPTS:=
+
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y)
+ISO9660_OPTS+=-U
+endif
+
+$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot $(LINUX_KERNEL) $(BINARIES_DIR)/rootfs.ext2 grub
+	@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
+	mkdir -p $(ISO9660_TARGET_DIR)
+	mkdir -p $(ISO9660_TARGET_DIR)/boot/grub
+	cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/
+	cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
+	cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel
+	cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd
+	# Use fakeroot to pretend all target binaries are owned by root
+	rm -f $(FAKEROOT_SCRIPT)
+	touch $(BUILD_DIR)/.fakeroot.00000
+	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
+	echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
+	# Use fakeroot so mkisofs believes the previous fakery
+	echo "$(HOST_DIR)/usr/bin/genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot " \
+		"-boot-load-size 4 -boot-info-table -o $@ $(ISO9660_TARGET_DIR)" \
+		>> $(FAKEROOT_SCRIPT)
+	chmod a+x $(FAKEROOT_SCRIPT)
+	$(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT)
+	-@rm -f $(FAKEROOT_SCRIPT)
+	-@rm -rf $(ISO9660_TARGET_DIR)
+
+iso9660-root: $(BINARIES_DIR)/rootfs.iso9660
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y)
+TARGETS+=iso9660-root
+endif

fs/jffs2/Config.in

@@ -1,6 +1,5 @@
 config BR2_TARGET_ROOTFS_JFFS2
 	bool "jffs2 root filesystem"
-	select BR2_HOST_FAKEROOT
 	help
 	  Build a jffs2 root filesystem
 
@@ -115,14 +114,4 @@ config BR2_TARGET_ROOTFS_JFFS2_SUMMARY
 	  A summarised image can be mounted faster if support is
 	  enabled in the kernel (CONFIG_JFFS2_SUMMARY)
 
-config BR2_TARGET_ROOTFS_JFFS2_OUTPUT
-	string "Output File"
-	default "$(IMAGE).jffs2"
-
-config BR2_TARGET_ROOTFS_JFFS2_COPYTO
-	string "also copy the image to..."
-	default ""
-	help
-	  Copies the resulting image to a secondary location.
-
 endif

fs/jffs2/jffs2.mk

@@ -0,0 +1,61 @@
+#############################################################
+#
+# Build the jffs2 root filesystem image
+#
+#############################################################
+
+JFFS2_OPTS := -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE)
+SUMTOOL_OPTS := $(JFFS2_OPTS)
+
+ifeq ($(BR2_TARGET_ROOTFS_JFFS2_PAD),y)
+ifneq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)),0x0)
+JFFS2_OPTS += --pad=$(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE))
+else
+JFFS2_OPTS += -p
+endif
+SUMTOOL_OPTS += -p
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_JFFS2_LE),y)
+JFFS2_OPTS += -l
+SUMTOOL_OPTS += -l
+endif
+
+ifeq ($(BR2_TARGET_ROOTFS_JFFS2_BE),y)
+JFFS2_OPTS += -b
+SUMTOOL_OPTS += -b
+endif
+
+JFFS2_OPTS += -s $(BR2_TARGET_ROOTFS_JFFS2_PAGESIZE)
+ifeq ($(BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER),y)
+JFFS2_OPTS += -n
+SUMTOOL_OPTS += -n
+endif
+
+ifneq ($(ROOTFS_DEVICE_TABLE),)
+JFFS2_OPTS += -D $(ROOTFS_DEVICE_TABLE)
+endif
+
+ROOTFS_JFFS2_DEPENDENCIES = host-mtd
+
+ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),)
+define ROOTFS_JFFS2_CMD
+	$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@.nosummary && \
+	$(SUMTOOL) $(SUMTOOL_OPTS) -i $$@.nosummary -o $$@ && \
+	rm $$@.nosummary
+endef
+else
+define ROOTFS_JFFS2_CMD
+	$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@
+endef
+endif
+
+define JFFS2_GEN_SREC
+	$(TARGET_CROSS)objcopy -I binary -O srec --adjust-vma 0xa1000000 $$@ $$@.srec
+endef
+
+ifeq ($(BR2_JFFS2_TARGET_SREC),y)
+ROOTFS_JFFS2_POST_GEN_HOOKS += JFFS2_GEN_SREC
+endif
+
+$(eval $(call ROOTFS_TARGET,jffs2))

fs/romfs/Config.in

@@ -1,6 +1,5 @@
 config BR2_TARGET_ROOTFS_ROMFS
 	bool "romfs root filesystem"
-	select BR2_HOST_FAKEROOT
 	help
 	  Build a romfs image of the root filesystem.
 

fs/romfs/romfs.mk

@@ -0,0 +1,15 @@
+#############################################################
+#
+# Build the romfs root filesystem image
+#
+#############################################################
+
+ROMFS_TARGET=$(IMAGE).romfs
+
+ROOTFS_ROMFS_DEPENDENCIES = host-genromfs
+
+define ROOTFS_ROMFS_CMD
+	$(HOST_DIR)/usr/bin/genromfs -d $(TARGET_DIR) -f $$@
+endef
+
+$(eval $(call ROOTFS_TARGET,romfs))

fs/squashfs/Config.in

@@ -0,0 +1,23 @@
+config BR2_TARGET_ROOTFS_SQUASHFS
+	bool "squashfs root filesystem"
+	help
+	  Build a squashfs root filesystem
+
+if BR2_TARGET_ROOTFS_SQUASHFS
+choice
+	prompt "SquashFS version"
+	default BR2_TARGET_ROOTFS_SQUASHFS4
+	help
+	  Select the Squash filesystem version to use to generate the
+	  root filesystem.
+
+config BR2_TARGET_ROOTFS_SQUASHFS4
+       bool "4.x"
+
+config BR2_TARGET_ROOTFS_SQUASHFS3
+       depends on BR2_DEPRECATED
+       bool "3.x"
+
+endchoice
+endif
+

fs/squashfs/squashfs.mk

@@ -0,0 +1,17 @@
+#############################################################
+#
+# Build the squashfs root filesystem image
+#
+#############################################################
+
+ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4),y)
+ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs
+else
+ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3
+endif
+
+define ROOTFS_SQUASHFS_CMD
+	$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend
+endef
+
+$(eval $(call ROOTFS_TARGET,squashfs))

fs/tar/Config.in

@@ -1,6 +1,5 @@
 config BR2_TARGET_ROOTFS_TAR
 	bool "tar the root filesystem"
-	select BR2_HOST_FAKEROOT
 	help
 	  Build a tar archive of the root filesystem
 
@@ -20,22 +19,16 @@ config BR2_TARGET_ROOTFS_TAR_GZIP
 	bool "gzip"
 	help
 	 Do compress the tarball with gzip.
-	 Note that you either have to have gzip installed on your host
-	 or select to build a gzip for your host. See the packages submenu.
 
 config BR2_TARGET_ROOTFS_TAR_BZIP2
 	bool "bzip2"
 	help
 	 Do compress the tarball with bzip2.
-	 Note that you either have to have bzip2 installed on your host
-	 or select to build a bzip2 for your host. See the packages submenu.
 
 config BR2_TARGET_ROOTFS_TAR_LZMA
 	bool "lzma"
 	help
 	 Do compress the tarball with lzma.
-	 Note that you either have to have lzma installed on your host
-	 or select to build a lzma for your host. See the packages submenu.
 
 endchoice
 
@@ -46,14 +39,3 @@ config BR2_TARGET_ROOTFS_TAR_OPTIONS
 	help
 	  Any other flags you want to pass to tar
 	  Refer to tar --help for details
-
-config BR2_TARGET_ROOTFS_TAR_COPYTO
-	string "also copy the image to..."
-	depends on BR2_TARGET_ROOTFS_TAR
-	default ""
-	help
-	  Copies the resulting image to a secondary location
-	  like a tftp server's root directory.
-
-	  Example: $(IMAGE)-$(DATE).tar
-

fs/tar/tar.mk

@@ -0,0 +1,13 @@
+#############################################################
+#
+# tar to archive target filesystem
+#
+#############################################################
+
+TAR_OPTS:=$(BR2_TARGET_ROOTFS_TAR_OPTIONS)
+
+define ROOTFS_TAR_CMD
+ tar -c$(TAR_OPTS)f $$@ -C $(TARGET_DIR) .
+endef
+
+$(eval $(call ROOTFS_TARGET,tar))

fs/ubifs/Config.in

@@ -1,7 +1,5 @@
 config BR2_TARGET_ROOTFS_UBIFS
 	bool "ubifs root filesystem"
-	depends on BROKEN # upstream git gone, should use mtd-utils
-	select BR2_HOST_FAKEROOT
 	help
 	  Build a ubifs root filesystem
 
@@ -24,11 +22,6 @@ config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
 	help
 	  Some comment required here
 
-config BR2_TARGET_ROOTFS_UBIFS_OUTPUT
-	string "Output File"
-	depends on BR2_TARGET_ROOTFS_UBIFS
-	default "$(IMAGE).ubifs"
-
 choice
 	prompt "ubifs runtime compression"
 	default BR2_TARGET_ROOTFS_UBIFS_RT_LZO
@@ -71,33 +64,16 @@ config BR2_TARGET_ROOTFS_UBIFS_GZIP
 	bool "gzip"
 	help
 	  Do compress the ubifs filesystem with gzip.
-	  Note that you either have to have gzip installed on your
-	  host or select to build a gzip for your host. See the
-	  packages submenu.
 
 config BR2_TARGET_ROOTFS_UBIFS_BZIP2
 	bool "bzip2"
 	help
 	  Do compress the ubifs filesystem with bzip2.
-	  Note that you either have to have bzip2 installed on your
-	  host or select to build a bzip2 for your host. See the
-	  packages submenu.
 
 config BR2_TARGET_ROOTFS_UBIFS_LZMA
 	bool "lzma"
 	help
 	  Do compress the ubifs filesystem with lzma.
-	  Note that you either have to have lzma installed on your
-	  host or select to build a lzma for your host. See the
-	  packages submenu.
 
 endchoice
 
-config BR2_TARGET_ROOTFS_UBIFS_COPYTO
-	string "also copy the image to..."
-	depends on BR2_TARGET_ROOTFS_UBIFS
-	default ""
-	help
-	  Copies the resulting image to a secondary location
-	  like a tftp server's root directory.
-

fs/ubifs/ubifs.mk

@@ -0,0 +1,25 @@
+#############################################################
+#
+# Build the ubifs root filesystem image
+#
+#############################################################
+
+UBIFS_OPTS := -e $(BR2_TARGET_ROOTFS_UBIFS_LEBSIZE) -c $(BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT) -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE)
+
+ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB),y)
+UBIFS_OPTS += -x zlib
+endif
+ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_LZI),y)
+UBIFS_OPTS += -x lzo
+endif
+ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_NONE),y)
+UBIFS_OPTS += -x none
+endif
+
+ROOTFS_UBIFS_DEPENDENCIES = host-mtd
+
+define ROOTFS_UBIFS_CMD
+	$(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $$@
+endef
+
+$(eval $(call ROOTFS_TARGET,ubifs))

package/Config.in

@@ -1,14 +1,50 @@
 menu "Package Selection for the target"
 
 source "package/busybox/Config.in"
+source "package/customize/Config.in"
 
-comment "The minimum needed to build a uClibc development system"
+# Audio and video applications
+source "package/multimedia/Config.in"
 
+menu "Compressors and decompressors"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/bash/Config.in"
 source "package/bzip2/Config.in"
+source "package/gzip/Config.in"
+endif
+source "package/lzop/Config.in"
+source "package/lzma/Config.in"
+endmenu
+
+menu "Debugging, profiling and benchmark"
+source "package/dmalloc/Config.in"
+source "package/kexec/Config.in"
+source "package/lmbench/Config.in"
+source "package/lsof/Config.in"
+source "package/ltp-testsuite/Config.in"
+source "package/ltrace/Config.in"
+source "package/memstat/Config.in"
+source "package/netperf/Config.in"
+source "package/oprofile/Config.in"
+source "package/strace/Config.in"
+source "package/valgrind/Config.in"
+endmenu
+
+menu "Development tools"
+source "package/autoconf/Config.in"
+source "package/automake/Config.in"
+source "package/bison/Config.in"
+source "package/bsdiff/Config.in"
+source "toolchain/ccache/Config.in.2"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/coreutils/Config.in"
+endif
+source "package/cvs/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/diffutils/Config.in"
+endif
+source "package/distcc/Config.in"
+source "package/fakeroot/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/findutils/Config.in"
 endif
 source "package/flex/Config.in"
@@ -16,294 +52,51 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gawk/Config.in"
 endif
 source "toolchain/gcc/Config.in.2"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/grep/Config.in"
-endif
-source "package/make/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/patch/Config.in"
-source "package/sed/Config.in"
-source "package/tar/Config.in"
-endif
-
-comment "Other development stuff"
-source "package/autoconf/Config.in"
-source "package/automake/Config.in"
-source "package/bison/Config.in"
-source "toolchain/ccache/Config.in.2"
-source "package/cvs/Config.in"
-source "package/distcc/Config.in"
-source "package/dmalloc/Config.in"
-source "package/fakeroot/Config.in"
 source "package/gettext/Config.in"
 source "package/gmp/Config.in"
 source "package/gperf/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/grep/Config.in"
+endif
+source "package/intltool/Config.in"
+source "package/make/Config.in"
 source "package/mpfr/Config.in"
 source "package/libtool/Config.in"
 source "package/m4/Config.in"
-source "package/oprofile/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/patch/Config.in"
+endif
 source "package/pkg-config/Config.in"
-source "package/readline/Config.in"
-source "package/valgrind/Config.in"
-source "package/pcre/Config.in"
-source "package/intltool/Config.in"
-
-comment "Other stuff"
-source "package/at/Config.in"
-source "package/beecrypt/Config.in"
-source "package/berkeleydb/Config.in"
-source "package/bsdiff/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/bootutils/Config.in"
+source "package/sed/Config.in"
+source "package/tar/Config.in"
 endif
-source "package/cups/Config.in"
-source "package/customize/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/dash/Config.in"
-endif
-source "package/enchant/Config.in"
-source "package/file/Config.in"
-source "package/gamin/Config.in"
-source "package/icu/Config.in"
-source "package/kexec/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/less/Config.in"
-endif
-source "package/libconfig/Config.in"
-source "package/libconfuse/Config.in"
-source "package/libdaemon/Config.in"
-source "package/libelf/Config.in"
-source "package/libevent/Config.in"
-source "package/libfloat/Config.in"
-source "package/libgcrypt/Config.in"
-source "package/libgpg-error/Config.in"
-source "package/libiconv/Config.in"
-source "package/libidn/Config.in"
-source "package/liblockfile/Config.in"
-source "package/liboil/Config.in"
-source "package/libsysfs/Config.in"
-source "package/lockfile-progs/Config.in"
-source "package/logrotate/Config.in"
-source "package/lsof/Config.in"
-source "package/ltp-testsuite/Config.in"
-source "package/ltrace/Config.in"
-source "package/memstat/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/module-init-tools/Config.in"
-source "package/modutils/Config.in"
-endif
-source "package/ng-spice-rework/Config.in"
-source "package/popt/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/procps/Config.in"
-endif
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/psmisc/Config.in"
-endif
-source "package/screen/Config.in"
-source "package/shared-mime-info/Config.in"
-source "package/startup-notification/Config.in"
-source "package/strace/Config.in"
-source "package/sudo/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/sysklogd/Config.in"
-# busybox has init and the runit stuff
-source "package/sysvinit/Config.in"
-source "package/util-linux/Config.in"
-source "package/which/Config.in"
-endif
-
-source "package/database/Config.in"
-
-# text editors
-source "package/editors/Config.in"
-
-menu "Networking"
-
-comment "Networking applications"
-source "package/argus/Config.in"
-source "package/avahi/Config.in"
-source "package/axel/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/boa/Config.in"
-endif
-source "package/bind/Config.in"
-source "package/bmon/Config.in"
-source "package/bridge-utils/Config.in"
-source "package/ctorrent/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/dhcp/Config.in"
-endif
-source "package/dnsmasq/Config.in"
-source "package/dropbear/Config.in"
-source "package/ethtool/Config.in"
-source "package/haserl/Config.in"
-source "package/hostapd/Config.in"
-source "package/ifplugd/Config.in"
-source "package/iperf/Config.in"
-source "package/iproute2/Config.in"
-source "package/ipsec-tools/Config.in"
-source "package/iptables/Config.in"
-source "package/iw/Config.in"
-source "package/kismet/Config.in"
-source "package/l2tp/Config.in"
-source "package/libcgi/Config.in"
-source "package/libcgicc/Config.in"
-source "package/libcurl/Config.in"
-source "package/libdnet/Config.in"
-source "package/libeXosip2/Config.in"
-source "package/libmicrohttpd/Config.in"
-source "package/libnl/Config.in"
-source "package/libosip2/Config.in"
-source "package/libpcap/Config.in"
-source "package/libsoup/Config.in"
-source "package/libupnp/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/lighttpd/Config.in"
-endif
-source "package/links/Config.in"
-source "package/lrzsz/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/microcom/Config.in"
-endif
-source "package/mii-diag/Config.in"
-source "package/mrouted/Config.in"
-source "package/mutt/Config.in"
-source "package/nbd/Config.in"
-source "package/ncftp/Config.in"
-source "package/neon/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/netcat/Config.in"
-source "package/netkitbase/Config.in"
-source "package/netkittelnet/Config.in"
-endif
-source "package/netplug/Config.in"
-source "package/netsnmp/Config.in"
-source "package/netstat-nat/Config.in"
-source "package/nfs-utils/Config.in"
-source "package/ntp/Config.in"
-source "package/olsr/Config.in"
-source "package/openntpd/Config.in"
-source "package/openssh/Config.in"
-source "package/openssl/Config.in"
-source "package/openvpn/Config.in"
-source "package/portmap/Config.in"
-source "package/pppd/Config.in"
-source "package/radvd/Config.in"
-source "package/rp-pppoe/Config.in"
-source "package/pptp-linux/Config.in"
-source "package/proftpd/Config.in"
-source "package/quagga/Config.in"
-source "package/rsync/Config.in"
-source "package/samba/Config.in"
-source "package/ser2net/Config.in"
-source "package/socat/Config.in"
-source "package/spawn-fcgi/Config.in"
-source "package/stunnel/Config.in"
-source "package/tcpdump/Config.in"
-source "package/tcpreplay/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/tftpd/Config.in"
-source "package/thttpd/Config.in"
-source "package/tinyhttpd/Config.in"
-endif
-source "package/tn5250/Config.in"
-source "package/ttcp/Config.in"
-source "package/udpcast/Config.in"
-source "package/vpnc/Config.in"
-source "package/vsftpd/Config.in"
-source "package/vtun/Config.in"
-source "package/webif/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/wget/Config.in"
-endif
-source "package/wireless-tools/Config.in"
-source "package/wpa_supplicant/Config.in"
-
 endmenu
 
-menu "Hardware handling / blockdevices and filesystem maintenance"
-source "package/acpid/Config.in"
-source "package/dbus/Config.in"
-source "package/dbus-glib/Config.in"
-source "package/dbus-python/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/devmem2/Config.in"
-endif
-source "package/dmraid/Config.in"
-source "package/dosfstools/Config.in"
-source "package/e2fsprogs/Config.in"
-source "package/eeprog/Config.in"
-source "package/fconfig/Config.in"
-source "package/fis/Config.in"
-source "package/fuse/Config.in"
-source "package/gadgetfs-test/Config.in"
-source "package/gvfs/Config.in"
-source "package/hal/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/hdparm/Config.in"
-source "package/hotplug/Config.in"
-endif
-source "package/hwdata/Config.in"
-source "package/i2c-tools/Config.in"
-source "package/input-tools/Config.in"
-source "package/iostat/Config.in"
-source "package/libaio/Config.in"
-source "package/libraw1394/Config.in"
-source "package/libusb/Config.in"
-source "package/lm-sensors/Config.in"
-source "package/lvm2/Config.in"
-source "package/mdadm/Config.in"
-source "package/memtester/Config.in"
-source "package/mtd/Config.in"
-source "package/ntfs-3g/Config.in"
-source "package/ntfsprogs/Config.in"
-source "package/pciutils/Config.in"
-source "package/pcmcia/Config.in"
-source "package/setserial/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-# busybox has fdisk
-source "package/sfdisk/Config.in"
-endif
-source "package/smartmontools/Config.in"
-source "package/sshfs/Config.in"
-source "package/sysstat/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-# mdev
-source "package/udev/Config.in"
-endif
-source "package/usb_modeswitch/Config.in"
-source "package/usbmount/Config.in"
-source "package/usbutils/Config.in"
-source "package/wipe/Config.in"
-source "package/xfsprogs/Config.in"
+menu "Games"
+source "package/games/ace_of_penguins/Config.in"
+source "package/games/doom-wad/Config.in"
+source "package/games/gnuchess/Config.in"
+source "package/games/lxdoom/Config.in"
+source "package/games/magiccube4d/Config.in"
+source "package/games/prboom/Config.in"
+source "package/games/rubix/Config.in"
 endmenu
 
-# Audio/Video support
-source "package/multimedia/Config.in"
-
 menu "Graphic libraries and applications (graphic/text)"
-comment "text rendering libraries"
-source "package/ncurses/Config.in"
-source "package/newt/Config.in"
-source "package/slang/Config.in"
-
-comment "text rendering applications"
-source "package/dialog/Config.in"
 
 comment "graphic libraries"
 source "package/directfb/Config.in"
 source "package/directfb-examples/Config.in"
 source "package/divine/Config.in"
 source "package/fbdump/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/fbset/Config.in"
+endif
+source "package/fbv/Config.in"
 source "package/imagemagick/Config.in"
-source "package/jpeg/Config.in"
-source "package/libart/Config.in"
-source "package/libpng/Config.in"
-source "package/libungif/Config.in"
 source "package/linux-fusion/Config.in"
 source "package/lite/Config.in"
-source "package/pixman/Config.in"
 source "package/sawman/Config.in"
 source "package/sdl/Config.in"
 source "package/sdl_image/Config.in"
@@ -312,12 +105,6 @@ source "package/sdl_sound/Config.in"
 source "package/sdl_net/Config.in"
 source "package/sdl_ttf/Config.in"
 source "package/sdl_gfx/Config.in"
-source "package/tiff/Config.in"
-
-comment "busybox graphic applications"
-comment "--> May be broken in busybox"
-source "package/fbv/Config.in"
-source "package/fbset/Config.in"
 
 comment "other GUIs"
 source "package/qt/Config.in"
@@ -327,24 +114,8 @@ source "package/qt/Config.in"
 source "package/x11r7/Config.in"
 
 comment "X libraries and helper libraries"
-source "package/atk/Config.in"
-source "package/cairo/Config.in"
-source "package/pango/Config.in"
-source "package/libdrm/Config.in"
 source "package/liberation/Config.in"
-source "package/libglade/Config.in"
-source "package/libglib12/Config.in"
-source "package/libglib2/Config.in"
-source "package/libgtk12/Config.in"
-source "package/libgtk2/Config.in"
-source "package/gtk2-engines/Config.in"
-source "package/gtk2-themes/Config.in"
 source "package/libsexy/Config.in"
-source "package/fltk/Config.in"
-source "package/fontconfig/Config.in"
-source "package/freetype/Config.in"
-source "package/tslib/Config.in"
-source "package/webkit/Config.in"
 
 comment "X Window managers"
 source "package/matchbox/Config.in"
@@ -372,20 +143,291 @@ source "package/xstroke/Config.in"
 source "package/xvkbd/Config.in"
 endmenu
 
-menu "Compressors / decompressors"
-
+menu "Hardware handling"
+source "package/acpid/Config.in"
+source "package/cdrkit/Config.in"
+source "package/cramfs/Config.in"
+source "package/dbus/Config.in"
+source "package/dbus-glib/Config.in"
+source "package/dbus-python/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/gzip/Config.in"
+source "package/devmem2/Config.in"
 endif
+source "package/dmraid/Config.in"
+source "package/dosfstools/Config.in"
+source "package/e2fsprogs/Config.in"
+source "package/eeprog/Config.in"
+source "package/fconfig/Config.in"
+source "package/fis/Config.in"
+source "package/gadgetfs-test/Config.in"
+source "package/genext2fs/Config.in"
+source "package/genromfs/Config.in"
+source "package/gvfs/Config.in"
+source "package/hal/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/hdparm/Config.in"
+source "package/hotplug/Config.in"
+endif
+source "package/hwdata/Config.in"
+source "package/i2c-tools/Config.in"
+source "package/input-tools/Config.in"
+source "package/iostat/Config.in"
+source "package/lm-sensors/Config.in"
+source "package/lvm2/Config.in"
+source "package/makedevs/Config.in"
+source "package/mdadm/Config.in"
+source "package/memtester/Config.in"
+source "package/mtd/Config.in"
+source "package/ntfs-3g/Config.in"
+source "package/ntfsprogs/Config.in"
+source "package/pciutils/Config.in"
+source "package/pcmcia/Config.in"
+source "package/setserial/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+# busybox has fdisk
+source "package/sfdisk/Config.in"
+endif
+source "package/smartmontools/Config.in"
+source "package/squashfs/Config.in"
+source "package/squashfs3/Config.in"
+source "package/sshfs/Config.in"
+source "package/sysstat/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+# mdev
+source "package/udev/Config.in"
+endif
+source "package/usb_modeswitch/Config.in"
+source "package/usbmount/Config.in"
+source "package/usbutils/Config.in"
+source "package/wipe/Config.in"
+source "package/xfsprogs/Config.in"
+endmenu
+
+menu "Interpreter languages and scripting"
+source "package/haserl/Config.in"
+source "package/java/jamvm/Config.in"
+source "package/lua/Config.in"
+source "package/microperl/Config.in"
+source "package/php/Config.in"
+source "package/python/Config.in"
+source "package/ruby/Config.in"
+source "package/tcl/Config.in"
+endmenu
+
+menu "Libraries"
+
+menu "Compression and decompression"
 source "package/libarchive/Config.in"
 source "package/lzo/Config.in"
-source "package/lzop/Config.in"
-source "package/lzma/Config.in"
 source "package/zlib/Config.in"
 endmenu
 
-menu "Package managers"
+menu "Crypto"
+source "package/beecrypt/Config.in"
+source "package/libgcrypt/Config.in"
+source "package/libgpg-error/Config.in"
+source "package/openssl/Config.in"
+endmenu
 
+menu "Database"
+source "package/berkeleydb/Config.in"
+source "package/mysql_client/Config.in"
+source "package/sqlite/Config.in"
+endmenu
+
+menu "Filesystem"
+source "package/gamin/Config.in"
+source "package/libconfig/Config.in"
+source "package/libconfuse/Config.in"
+source "package/fuse/Config.in"
+source "package/liblockfile/Config.in"
+source "package/libsysfs/Config.in"
+endmenu
+
+menu "Graphics"
+source "package/atk/Config.in"
+source "package/cairo/Config.in"
+source "package/fltk/Config.in"
+source "package/fontconfig/Config.in"
+source "package/freetype/Config.in"
+source "package/gtk2-engines/Config.in"
+source "package/gtk2-themes/Config.in"
+source "package/jpeg/Config.in"
+source "package/libart/Config.in"
+source "package/libdrm/Config.in"
+source "package/libglade/Config.in"
+source "package/libgtk12/Config.in"
+source "package/libgtk2/Config.in"
+source "package/libpng/Config.in"
+source "package/libungif/Config.in"
+source "package/pango/Config.in"
+source "package/pixman/Config.in"
+source "package/tiff/Config.in"
+source "package/webkit/Config.in"
+endmenu
+
+menu "Hardware handling"
+source "package/libaio/Config.in"
+source "package/libraw1394/Config.in"
+source "package/tslib/Config.in"
+source "package/libusb/Config.in"
+source "package/libusb-compat/Config.in"
+endmenu
+
+menu "Java"
+source "package/java/classpath/Config.in"
+source "package/java/concierge/Config.in"
+endmenu
+
+menu "Networking"
+source "package/libcgi/Config.in"
+source "package/libcgicc/Config.in"
+source "package/libcurl/Config.in"
+source "package/libdnet/Config.in"
+source "package/libeXosip2/Config.in"
+source "package/libidn/Config.in"
+source "package/libmicrohttpd/Config.in"
+source "package/neon/Config.in"
+source "package/libnl/Config.in"
+source "package/libpcap/Config.in"
+source "package/libosip2/Config.in"
+source "package/librsync/Config.in"
+source "package/libsoup/Config.in"
+source "package/libupnp/Config.in"
+endmenu
+
+menu "Other"
+source "package/libatomic_ops/Config.in"
+source "package/libcap/Config.in"
+source "package/libdaemon/Config.in"
+source "package/libelf/Config.in"
+source "package/libevent/Config.in"
+source "package/libfloat/Config.in"
+source "package/libglib12/Config.in"
+source "package/libglib2/Config.in"
+source "package/liboil/Config.in"
+source "package/startup-notification/Config.in"
+endmenu
+
+menu "Text and terminal handling"
+source "package/enchant/Config.in"
+source "package/icu/Config.in"
+source "package/libiconv/Config.in"
+source "package/ncurses/Config.in"
+source "package/newt/Config.in"
+source "package/pcre/Config.in"
+source "package/popt/Config.in"
+source "package/readline/Config.in"
+source "package/slang/Config.in"
+endmenu
+
+menu "XML"
+source "package/expat/Config.in"
+source "package/ezxml/Config.in"
+source "package/libxml-parser-perl/Config.in"
+source "package/libxml2/Config.in"
+source "package/libxslt/Config.in"
+source "package/xerces/Config.in"
+endmenu
+
+endmenu
+
+menu "Miscellaneous"
+source "package/ng-spice-rework/Config.in"
+source "package/shared-mime-info/Config.in"
+endmenu
+
+menu "Networking applications"
+source "package/argus/Config.in"
+source "package/avahi/Config.in"
+source "package/axel/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/boa/Config.in"
+endif
+source "package/bind/Config.in"
+source "package/bmon/Config.in"
+source "package/bridge-utils/Config.in"
+source "package/ctorrent/Config.in"
+source "package/cups/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/dhcp/Config.in"
+endif
+source "package/dnsmasq/Config.in"
+source "package/dropbear/Config.in"
+source "package/ethtool/Config.in"
+source "package/hostapd/Config.in"
+source "package/ifplugd/Config.in"
+source "package/iperf/Config.in"
+source "package/iproute2/Config.in"
+source "package/ipsec-tools/Config.in"
+source "package/iptables/Config.in"
+source "package/iw/Config.in"
+source "package/kismet/Config.in"
+source "package/l2tp/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/lighttpd/Config.in"
+endif
+source "package/links/Config.in"
+source "package/lrzsz/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/microcom/Config.in"
+endif
+source "package/mii-diag/Config.in"
+source "package/mrouted/Config.in"
+source "package/mutt/Config.in"
+source "package/nbd/Config.in"
+source "package/ncftp/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/netcat/Config.in"
+source "package/netkitbase/Config.in"
+source "package/netkittelnet/Config.in"
+endif
+source "package/netplug/Config.in"
+source "package/netsnmp/Config.in"
+source "package/netstat-nat/Config.in"
+source "package/nfs-utils/Config.in"
+source "package/ntp/Config.in"
+source "package/olsr/Config.in"
+source "package/openntpd/Config.in"
+source "package/openssh/Config.in"
+source "package/openvpn/Config.in"
+source "package/portmap/Config.in"
+source "package/pppd/Config.in"
+source "package/radvd/Config.in"
+source "package/rp-pppoe/Config.in"
+source "package/pptp-linux/Config.in"
+source "package/proftpd/Config.in"
+source "package/quagga/Config.in"
+source "package/rsync/Config.in"
+source "package/samba/Config.in"
+source "package/ser2net/Config.in"
+source "package/socat/Config.in"
+source "package/spawn-fcgi/Config.in"
+source "package/squid/Config.in"
+source "package/stunnel/Config.in"
+source "package/tcpdump/Config.in"
+source "package/tcpreplay/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/tftpd/Config.in"
+source "package/thttpd/Config.in"
+source "package/tinyhttpd/Config.in"
+endif
+source "package/tn5250/Config.in"
+source "package/ttcp/Config.in"
+source "package/udpcast/Config.in"
+source "package/vpnc/Config.in"
+source "package/vsftpd/Config.in"
+source "package/vtun/Config.in"
+source "package/webif/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/wget/Config.in"
+endif
+source "package/wireless-tools/Config.in"
+source "package/wpa_supplicant/Config.in"
+
+endmenu
+
+menu "Package managers"
 source "package/ipkg/Config.in"
 source "package/portage/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -393,30 +435,44 @@ source "package/rpm/Config.in"
 endif
 endmenu
 
-menu "Interpreter languages / Scripting"
-
-source "package/lua/Config.in"
-source "package/microperl/Config.in"
-source "package/python/Config.in"
-source "package/ruby/Config.in"
-source "package/tcl/Config.in"
-source "package/php/Config.in"
+menu "Shell and utilities"
+source "package/at/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/bash/Config.in"
+source "package/dash/Config.in"
+endif
+source "package/dialog/Config.in"
+source "package/file/Config.in"
+source "package/lockfile-progs/Config.in"
+source "package/logrotate/Config.in"
+source "package/screen/Config.in"
+source "package/sudo/Config.in"
+source "package/which/Config.in"
 endmenu
 
-menu "XML handling"
-
-source "package/expat/Config.in"
-source "package/ezxml/Config.in"
-source "package/libxml2/Config.in"
-source "package/libxslt/Config.in"
-source "package/xerces/Config.in"
-source "package/libxml-parser-perl/Config.in"
+menu "System tools"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/bootutils/Config.in"
+source "package/module-init-tools/Config.in"
+source "package/modutils/Config.in"
+source "package/procps/Config.in"
+source "package/psmisc/Config.in"
+source "package/sysklogd/Config.in"
+source "package/sysvinit/Config.in"
+source "package/util-linux/Config.in"
+endif
 endmenu
 
-# java support
-source "package/java/Config.in"
-
-# various games packages
-source "package/games/Config.in"
+menu "Text editors and viewers"
+source "package/ed/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/less/Config.in"
+endif
+source "package/nano/Config.in"
+source "package/uemacs/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+source "package/vim/Config.in"
+endif
+endmenu
 
 endmenu

package/Makefile.autotools.in

@@ -49,6 +49,14 @@ ifndef $(2)_SUBDIR
  endif
 endif
 
+ifndef $(2)_LIBTOOL_PATCH
+ ifdef $(3)_LIBTOOL_PATCH
+  $(2)_LIBTOOL_PATCH = $($(3)_LIBTOOL_PATCH)
+ else
+  $(2)_LIBTOOL_PATCH ?= YES
+ endif
+endif
+
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPT			?=
 $(2)_MAKE			?= $(MAKE)
@@ -56,11 +64,10 @@ $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
 $(2)_AUTORECONF			?= NO
 $(2)_AUTORECONF_OPT		?=
-$(2)_LIBTOOL_PATCH		?= YES
 $(2)_USE_CONFIG_CACHE           ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
 ifeq ($(BR2_ENABLE_DEBUG),y)
-$(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install-exec
+$(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install
 else
 $(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install-strip
 endif
@@ -86,7 +93,7 @@ define $(2)_CONFIGURE_CMDS
 	$$(TARGET_CONFIGURE_ENV) \
 	$$($$(PKG)_CONF_ENV) \
 	./configure \
-		$(if $(filter YES,$$($$(PKG)_USE_CONFIG_CACHE)),--cache-file="$(BUILD_DIR)/tgt-config.cache",) \
+		$$(if $$(filter YES,$$($$(PKG)_USE_CONFIG_CACHE)),--cache-file="$(BUILD_DIR)/tgt-config.cache",) \
 		--target=$$(GNU_TARGET_NAME) \
 		--host=$$(GNU_TARGET_NAME) \
 		--build=$$(GNU_HOST_NAME) \
@@ -108,6 +115,7 @@ define $(2)_CONFIGURE_CMDS
 	        $$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$$(HOST_CFLAGS)" \
 		LDFLAGS="$$(HOST_LDFLAGS)" \
+                $$($$(PKG)_CONF_ENV) \
 		./configure \
 		--prefix="$$(HOST_DIR)/usr" \
 		--sysconfdir="$$(HOST_DIR)/etc" \
@@ -128,9 +136,7 @@ define UPDATE_CONFIG_HOOK
 	done
 endef
 
-ifeq ($(BR2_UPDATE_CONFIG),y)
 $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
-endif
 
 #
 # Hook to patch libtool to make it work properly for cross-compilation
@@ -146,7 +152,7 @@ define LIBTOOL_PATCH_HOOK
 endef
 
 # default values are not evaluated yet, so don't rely on this defaulting to YES
-ifneq ($($(2)_LIBTOOL_PATCH),NO)
+ifneq ($$($(2)_LIBTOOL_PATCH),NO)
 $(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK
 endif
 
@@ -163,7 +169,7 @@ define AUTORECONF_HOOK
 	fi
 endef
 
-ifeq ($($(2)_AUTORECONF),YES)
+ifeq ($$($(2)_AUTORECONF),YES)
 $(2)_POST_PATCH_HOOKS += AUTORECONF_HOOK
 $(2)_DEPENDENCIES += host-automake host-autoconf host-libtool
 endif
@@ -202,7 +208,7 @@ ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
 	$$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
 	for i in $$$$(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \
-		cp $$$$i $$$$i~; \
+		cp -f $$$$i $$$$i~; \
 		$$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$$$i; \
 	done
 endef

package/Makefile.in

@@ -34,16 +34,7 @@ ifeq ($(BR2_DEBUG_3),y)
 TARGET_DEBUGGING=-g3
 endif
 
-
-#########################################################################
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \
-	-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
-ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
-TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
-TARGET_LDFLAGS+= $(BR2_SYSROOT)
-endif
+TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 
 CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
 CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
@@ -86,46 +77,57 @@ ifeq ($(BR2_LARGEFILE),y)
 TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
-TARGET_CXXFLAGS=$(TARGET_CFLAGS)
+# Host packages are sometimes linked against host libraries installed
+# in $(HOST_DIR)/usr/lib. As we cannot add $(HOST_DIR)/usr/lib to
+# LD_LIBRARY_PATH when building target packages because it causes
+# libtool breakage, we force a rpath to be added to host binaries.
+HOST_CFLAGS+=-Wl,-rpath -Wl,$(HOST_DIR)/usr/lib
 
-# else it's an external toolchain
 #########################################################################
-else
-TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) --sysroot $(STAGING_DIR)/
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
+TARGET_CXXFLAGS=$(TARGET_CFLAGS)
+ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
+TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
+TARGET_LDFLAGS+= $(BR2_SYSROOT)
+endif
+
+#########################################################################
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+TARGET_CFLAGS+=--sysroot $(STAGING_DIR)/
 TARGET_CXXFLAGS=$(TARGET_CFLAGS)
 TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/
+TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
 endif
 #########################################################################
-#ifeq ($(BR2_ROOTFS_SUFFIX),)
-ROOTFS_SUFFIX:=$(call qstrip,$(BR2_ROOTFS_SUFFIX))
-ifeq ($(ROOTFS_SUFFIX),)
-ROOTFS_SUFFIX:=
-else
-XXXX=xxxx
-ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
-endif
+
+# Compute GNU_TARGET_NAME and REAL_GNU_TARGET_NAME
+GNU_TARGET_NAME=$(ARCH)-linux
+
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+LIBC=uclibc
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
+LIBC=uclibc
+else
+LIBC=
+endif
+
+ifeq ($(BR2_ARM_EABI),y)
+ABI=gnueabi
+endif
+
+REAL_GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 
 # Quotes are needed for spaces et al in path components.
 TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX)
-GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
-REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
 TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
-KERNEL_CROSS=$(TARGET_CROSS)
-else
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
 TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
 TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
-TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
-#IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX)
-
-REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
-GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
-KERNEL_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 endif
 TARGET_AR=$(TARGET_CROSS)ar
@@ -139,10 +141,10 @@ TARGET_NM=$(TARGET_CROSS)nm
 TARGET_RANLIB=$(TARGET_CROSS)ranlib
 TARGET_OBJCOPY=$(TARGET_CROSS)objcopy
 TARGET_OBJDUMP=$(TARGET_CROSS)objdump
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
-TARGET_LDCONFIG=/sbin/ldconfig
-else
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 TARGET_LDCONFIG=$(TARGET_CROSS)ldconfig
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+TARGET_LDCONFIG=/sbin/ldconfig
 endif
 ifeq ($(BR2_STRIP_strip),y)
 STRIP_DISCARD_ALL:=--discard-all
@@ -179,21 +181,6 @@ HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)
 HOSTCC_VERSION:=$(shell $(HOSTCC) --version | \
 	sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p')
 
-HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
-	-e 's/sparc.*/sparc/' \
-	-e 's/arm.*/arm/g' \
-	-e 's/m68k.*/m68k/' \
-	-e 's/ppc/powerpc/g' \
-	-e 's/v850.*/v850/g' \
-	-e 's/sh[234]/sh/' \
-	-e 's/mips-.*/mips/' \
-	-e 's/mipsel-.*/mipsel/' \
-	-e 's/cris.*/cris/' \
-	-e 's/i[3-9]86/i386/' \
-	-e 's/xtensa.*/xtensa/' \
-	)
-GNU_HOST_NAME:=$(HOST_ARCH)-$(call qstrip,$(BR2_GNU_BUILD_SUFFIX))
-
 TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		AR="$(TARGET_AR)" \
 		AS="$(TARGET_AS)" \
@@ -229,7 +216,6 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
 		PERLLIB="$(HOST_DIR)/usr/lib/perl" \
-		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" \
 		STAGING_DIR="$(STAGING_DIR)"
 
 TARGET_CONFIGURE_ENV=\
@@ -239,7 +225,6 @@ TARGET_CONFIGURE_ENV=\
 	FCFLAGS="$(TARGET_FCFLAGS)" \
 
 TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \
-		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
 		PERLLIB="$(HOST_DIR)/usr/lib/perl"
 
 HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
@@ -277,9 +262,12 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \
 		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
 		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
+		PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
+		PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
-		PERLLIB="$(HOST_DIR)/usr/lib/perl"
+		PERLLIB="$(HOST_DIR)/usr/lib/perl" \
+		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
 
 HOST_MAKE_ENV=PATH=$(HOST_PATH) \
 		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \

package/Makefile.package.in

@@ -24,7 +24,21 @@
 
 # UPPERCASE Macro -- transform its argument to uppercase and replace dots and
 # hyphens to underscores
-UPPERCASE = $(shell echo $(1) | tr "a-z.-" "A-Z__")
+
+# Heavily inspired by the up macro from gmsl (http://gmsl.sf.net)
+# This is approx 5 times faster than forking a shell and tr, and
+# as this macro is used a lot it matters
+# This works by creating translation character pairs (E.G. a:A b:B)
+# and then looping though all of them running $(subst from,to,text)
+[FROM] := a b c d e f g h i j k l m n o p q r s t u v w x y z . -
+[TO]   := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _
+
+UPPERCASE = $(strip $(eval __tmp := $1) \
+     $(foreach c, $(join $(addsuffix :,$([FROM])),$([TO])), \
+	$(eval __tmp :=	\
+		$(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),\
+			$(__tmp)))) \
+     $(__tmp))
 
 # Define extrators for different archive suffixes
 INFLATE.bz2 = $(BZCAT)
@@ -171,15 +185,6 @@ $(BUILD_DIR)/%/.stamp_target_installed:
 	@$(call MESSAGE,"Installing to target")
 	$($(PKG)_INSTALL_TARGET_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
-	$(if $(BR2_HAVE_MANPAGES),,for d in man share/man; do \
-		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
-	done)
-	$(if $(BR2_HAVE_INFOPAGES),,for d in info share/info; do \
-		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
-	done)
-	$(if $(BR2_HAVE_DOCUMENTATION),,for d in doc share/doc; do \
-		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
-	done)
 	$(Q)touch $@
 
 # Clean package

package/argus/argus.mk

@@ -7,63 +7,15 @@ ARGUS_VERSION:=3.0.0.rc.34
 ARGUS_SOURCE:=argus_$(ARGUS_VERSION).orig.tar.gz
 ARGUS_PATCH:=argus_$(ARGUS_VERSION)-1.diff.gz
 ARGUS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/argus/
-ARGUS_DIR:=$(BUILD_DIR)/argus-$(ARGUS_VERSION)
-ARGUS_CAT:=$(ZCAT)
-ARGUS_BINARY:=bin/argus
-ARGUS_TARGET_BINARY:=usr/sbin/argus
+ARGUS_DEPENDENCIES=libpcap
+ARGUS_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) install
 
-$(DL_DIR)/$(ARGUS_SOURCE):
-	$(call DOWNLOAD,$(ARGUS_SITE),$(ARGUS_SOURCE))
-
-$(DL_DIR)/$(ARGUS_PATCH):
-	$(call DOWNLOAD,$(ARGUS_SITE),$(ARGUS_PATCH))
-
-argus-source: $(DL_DIR)/$(ARGUS_SOURCE) $(DL_DIR)/$(ARGUS_PATCH)
-
-$(ARGUS_DIR)/.unpacked: $(DL_DIR)/$(ARGUS_SOURCE) $(DL_DIR)/$(ARGUS_PATCH)
-	$(ARGUS_CAT) $(DL_DIR)/$(ARGUS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ARGUS_DIR) package/argus/ argus\*.patch
-ifneq ($(ARGUS_PATCH),)
-	(cd $(ARGUS_DIR) && $(ARGUS_CAT) $(DL_DIR)/$(ARGUS_PATCH) | patch -p1)
-	if [ -d $(ARGUS_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(ARGUS_DIR) $(ARGUS_DIR)/debian/patches \*.patch; \
+define ARGUS_DEBIAN_PATCH_APPLY
+	if [ -d $(@D)/debian/patches ]; then \
+		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
-endif
-	touch $@
+endef
 
-$(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked
-	(cd $(ARGUS_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		$(DISABLE_LARGEFILE) \
-	)
-	touch $@
+ARGUS_POST_PATCH_HOOKS += ARGUS_DEBIAN_PATCH_APPLY
 
-$(ARGUS_DIR)/$(ARGUS_BINARY): $(ARGUS_DIR)/.configured
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(ARGUS_DIR)
-
-$(TARGET_DIR)/$(ARGUS_TARGET_BINARY): $(ARGUS_DIR)/$(ARGUS_BINARY)
-	cp -dpf $(ARGUS_DIR)/$(ARGUS_BINARY) $@
-	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
-
-argus: libpcap $(TARGET_DIR)/$(ARGUS_TARGET_BINARY)
-
-argus-clean:
-	-$(MAKE) -C $(ARGUS_DIR) clean
-	rm -f $(TARGET_DIR)/$(ARGUS_TARGET_BINARY)
-
-argus-dirclean:
-	rm -rf $(ARGUS_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_ARGUS),y)
-TARGETS+=argus
-endif
+$(eval $(call AUTOTARGETS,package,argus))

package/autoconf/autoconf.mk

@@ -17,7 +17,7 @@ AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 AUTOCONF_DEPENDENCIES = microperl host-m4
 
 HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
-                    	 ac_cv_prog_gnu_m4_gnu=no
+			ac_cv_prog_gnu_m4_gnu=no
 
 HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
 
@@ -26,4 +26,5 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
 
 # variables used by other packages
 AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
-AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"
+AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
+AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)"

package/automake/automake.mk

@@ -25,6 +25,6 @@ $(eval $(call AUTOTARGETS,package,automake))
 $(eval $(call AUTOTARGETS,package,automake,host))
 
 # variables used by other packages
-AUTOMAKE:=$(HOST_DIR)/usr/bin/automake
+AUTOMAKE = $(HOST_DIR)/usr/bin/automake
 ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
 ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)

package/avahi/avahi.mk

@@ -75,7 +75,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
 		--disable-monodoc \
 		--disable-stack-protector \
 		--with-distro=none \
-		$(if $(BR2_HAVE_MANPAGES),--enable,--disable)-manpages \
+		$(if $(BR2_HAVE_DOCUMENTATION),--enable,--disable)-manpages \
 		$(if $(BR2_PACKAGE_AVAHI_AUTOIPD),--enable,--disable)-autoipd \
 		--with-avahi-user=default \
 		--with-avahi-group=default \

package/axel/axel.mk

@@ -32,7 +32,7 @@ $(AXEL_DIR)/$(AXEL_BINARY): $(AXEL_DIR)/Makefile.settings
 
 $(TARGET_DIR)/$(AXEL_TARGET_BINARY): $(AXEL_DIR)/$(AXEL_BINARY)
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-bin
-ifeq ($(BR2_HAVE_MANPAGES),y)
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-man
 endif
 

package/bash/bash.mk

@@ -81,14 +81,7 @@ $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
 	rm -f $(TARGET_DIR)/bin/bash*
 	mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
 	(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/share/man
-endif
 	rm -rf $(TARGET_DIR)/share/locale
-	rm -rf $(TARGET_DIR)/usr/share/doc
 
 # If both bash and busybox are selected, make certain bash wins
 # the fight over who gets to own the /bin/sh symlink.

package/berkeleydb/berkeleydb.mk

@@ -60,14 +60,7 @@ $(STAGING_DIR)/lib/$(DB_SHARLIB): $(DB_DIR)/build_unix/.libs/$(DB_SHARLIB)
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DB_DIR)/build_unix install
 	chmod a-x $(STAGING_DIR)/lib/libdb*so*
 	rm -f $(STAGING_DIR)/bin/db_*
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-	rm -rf $(STAGING_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-	rm -rf $(STAGING_DIR)/usr/share/man
-endif
 	rm -rf $(STAGING_DIR)/share/locale
-	rm -rf $(STAGING_DIR)/usr/share/doc
 
 $(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB)
 	rm -rf $(TARGET_DIR)/lib/libdb*

package/bind/bind.mk

@@ -16,7 +16,7 @@ BIND_TARGET_BINS = dig host nslookup nsupdate
 BIND_TARGET_LIBS = libbind9.* libdns.* libisccc.* libisccfg.* libisc.* liblwres.*
 BIND_CONF_ENV =	BUILD_CC="$(TARGET_CC)" \
 		BUILD_CFLAGS="$(TARGET_CFLAGS)"
-BIND_CONF_OPT =	$(DISABLE_IPV6) \
+BIND_CONF_OPT =	\
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-randomdev=/dev/urandom \

package/bison/bison.mk

@@ -6,77 +6,11 @@
 BISON_VERSION:=2.3
 BISON_SOURCE:=bison-$(BISON_VERSION).tar.bz2
 BISON_SITE:=$(BR2_GNU_MIRROR)/bison
-BISON_DIR:=$(BUILD_DIR)/bison-$(BISON_VERSION)
-BISON_CAT:=$(BZCAT)
-BISON_BINARY:=src/bison
-BISON_TARGET_BINARY:=usr/bin/bison
 
-$(DL_DIR)/$(BISON_SOURCE):
-	 $(call DOWNLOAD,$(BISON_SITE),$(BISON_SOURCE))
+define BISON_DISABLE_EXAMPLES
+	echo 'all install:' > $(@D)/examples/Makefile
+endef
 
-bison-source: $(DL_DIR)/$(BISON_SOURCE)
+BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
 
-$(BISON_DIR)/.unpacked: $(DL_DIR)/$(BISON_SOURCE)
-	$(BISON_CAT) $(DL_DIR)/$(BISON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(CONFIG_UPDATE) $(BISON_DIR)/build-aux
-	touch $@
-
-$(BISON_DIR)/.configured: $(BISON_DIR)/.unpacked
-	(cd $(BISON_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		gt_cv_func_gnugettext2_libintl=yes \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--includedir=/usr/include \
-		$(DISABLE_NLS) \
-	)
-	echo 'all install:' > $(BISON_DIR)/examples/Makefile
-	touch $@
-
-$(BISON_DIR)/$(BISON_BINARY): $(BISON_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(BISON_DIR)
-
-$(TARGET_DIR)/$(BISON_TARGET_BINARY): $(BISON_DIR)/$(BISON_BINARY)
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) install
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/share/man
-endif
-	rm -rf $(TARGET_DIR)/share/locale
-	rm -rf $(TARGET_DIR)/usr/share/doc
-	cp -a package/bison/yacc $(TARGET_DIR)/usr/bin/yacc
-
-bison: $(TARGET_DIR)/$(BISON_TARGET_BINARY)
-
-bison-clean:
-	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) uninstall
-	rm -f $(TARGET_DIR)/$(BISON_TARGET_BINARY)
-	-$(MAKE) -C $(BISON_DIR) clean
-
-bison-dirclean:
-	rm -rf $(BISON_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_BISON),y)
-TARGETS+=bison
-endif
+$(eval $(call AUTOTARGETS,package,bison))

package/boa/boa.mk

@@ -12,7 +12,7 @@ BOA_VERSION=0.94.14rc21
 BOA_SOURCE=boa-$(BOA_VERSION).tar.gz
 BOA_CAT:=$(ZCAT)
 BOA_SITE=http://www.boa.org/
-BOA_DIR=$(BUILD_DIR)/${shell basename $(BOA_SOURCE) .tar.gz}
+BOA_DIR=$(BUILD_DIR)/boa-$(BOA_VERSION)
 BOA_WORKDIR=$(BUILD_DIR)/boa_workdir
 
 $(DL_DIR)/$(BOA_SOURCE):

package/busybox/Config.in

@@ -9,9 +9,10 @@ config BR2_PACKAGE_BUSYBOX
 
 	  Most people will answer Y.
 
+if BR2_PACKAGE_BUSYBOX
+
 choice
 	prompt "BusyBox Version"
-	depends on BR2_PACKAGE_BUSYBOX
 	default BR2_BUSYBOX_VERSION_1_16_X
 	help
 	  Select the version of BusyBox you wish to use.
@@ -22,7 +23,6 @@ choice
 
 	config BR2_BUSYBOX_VERSION_1_13_X
 		bool "BusyBox 1.13.x"
-		depends on BR2_RECENT
 
 	config BR2_BUSYBOX_VERSION_1_14_X
 		bool "BusyBox 1.14.x"
@@ -30,7 +30,6 @@ choice
 
 	config BR2_BUSYBOX_VERSION_1_15_X
 		bool "BusyBox 1.15.x"
-		depends on BR2_DEPRECATED || BR2_RECENT
 
 	config BR2_BUSYBOX_VERSION_1_16_X
 		bool "BusyBox 1.16.x"
@@ -46,11 +45,10 @@ config BR2_BUSYBOX_VERSION
 	default "1.13.4"	if BR2_BUSYBOX_VERSION_1_13_X
 	default "1.14.4"	if BR2_BUSYBOX_VERSION_1_14_X
 	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X
-	default "1.16.0"	if BR2_BUSYBOX_VERSION_1_16_X
+	default "1.16.1"	if BR2_BUSYBOX_VERSION_1_16_X
 
 config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 	bool "Run BusyBox's own full installation"
-	depends on BR2_PACKAGE_BUSYBOX
 	default y
 	help
 	  If you want to run BusyBox's own full install for the
@@ -63,7 +61,6 @@ config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
-	depends on BR2_PACKAGE_BUSYBOX
 	default "package/busybox/busybox-1.16.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
 	default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X
 	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_13_X
@@ -78,20 +75,22 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
 
 config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	bool "Show packages that are also provided by busybox" if BR2_PACKAGE_BUSYBOX
-	default y if !BR2_PACKAGE_BUSYBOX
 	help
 	  Show packages in menuconfig that are potentially also provided
 	  by busybox.
 
 config BR2_PACKAGE_BUSYBOX_SKELETON
 	bool "use minimal target skeleton"
-	depends on BR2_PACKAGE_BUSYBOX
 	help
 	  Use a minimal target skeleton. Make sure to select mdev
 	  which is used to populate /dev/.
 
-#config BR2_PACKAGE_BUSYBOX_INITRAMFS
-#	bool "initramfs perusing busybox"
-#	depends on BR2_PACKAGE_BUSYBOX
-#	help
-#	  Build small initramfs perusing busybox.
+endif
+
+if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else
+
+# add dummy config so the stuff with busybox alternatives are shown
+# when busybox is disabled
+config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+       default y
+endif

package/busybox/busybox-1.13.x.config

@@ -47,6 +47,7 @@ CONFIG_FEATURE_SYSLOG=y
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 # CONFIG_LFS is not set
 CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""
 
 #
 # Debugging Options

package/busybox/busybox-1.16.0-ash.patch

@@ -1,35 +0,0 @@
-diff -urpN busybox-1.16.0/shell/ash.c busybox-1.16.0-ash/shell/ash.c
---- busybox-1.16.0/shell/ash.c	2010-01-25 01:59:38.000000000 +0100
-+++ busybox-1.16.0-ash/shell/ash.c	2010-02-21 01:52:22.000000000 +0100
-@@ -4539,7 +4539,7 @@ forkchild(struct job *jp, union node *n,
- 	if (mode == FORK_NOJOB          /* is it `xxx` ? */
- 	 && n && n->type == NCMD        /* is it single cmd? */
- 	/* && n->ncmd.args->type == NARG - always true? */
--	 && strcmp(n->ncmd.args->narg.text, "trap") == 0
-+	 && n->ncmd.args && strcmp(n->ncmd.args->narg.text, "trap") == 0
- 	 && n->ncmd.args->narg.next == NULL /* "trap" with no arguments */
- 	/* && n->ncmd.args->narg.backquote == NULL - do we need to check this? */
- 	) {
-@@ -4627,7 +4627,7 @@ forkchild(struct job *jp, union node *n,
- 	}
- #if JOBS
- 	if (n && n->type == NCMD
--	 && strcmp(n->ncmd.args->narg.text, "jobs") == 0
-+	 && n->ncmd.args && strcmp(n->ncmd.args->narg.text, "jobs") == 0
- 	) {
- 		TRACE(("Job hack\n"));
- 		/* "jobs": we do not want to clear job list for it,
-diff -urpN busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.right busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.right
---- busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.right	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.right	2010-02-21 01:52:22.000000000 +0100
-@@ -0,0 +1,3 @@
-+Test 1
-+Test 2
-+Done
-diff -urpN busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.tests busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.tests
---- busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.tests	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.tests	2010-02-21 01:52:22.000000000 +0100
-@@ -0,0 +1,3 @@
-+echo Test ` ` 1
-+echo Test `</dev/null` 2
-+echo Done

package/busybox/busybox-1.16.0-compat.patch

@@ -1,317 +0,0 @@
-diff -urpN busybox-1.16.0/coreutils/fsync.c busybox-1.16.0-compat/coreutils/fsync.c
---- busybox-1.16.0/coreutils/fsync.c	2010-01-25 01:59:38.000000000 +0100
-+++ busybox-1.16.0-compat/coreutils/fsync.c	2010-02-21 01:54:07.000000000 +0100
-@@ -7,6 +7,9 @@
-  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
-  */
- #include "libbb.h"
-+#ifndef O_NOATIME
-+# define O_NOATIME 0
-+#endif
- 
- /* This is a NOFORK applet. Be very careful! */
- 
-diff -urpN busybox-1.16.0/editors/diff.c busybox-1.16.0-compat/editors/diff.c
---- busybox-1.16.0/editors/diff.c	2010-01-25 01:59:38.000000000 +0100
-+++ busybox-1.16.0-compat/editors/diff.c	2010-02-21 01:54:07.000000000 +0100
-@@ -227,10 +227,12 @@ struct cand {
- 
- static int search(const int *c, int k, int y, const struct cand *list)
- {
-+	int i, j;
-+
- 	if (list[c[k]].y < y)	/* quick look for typical case */
- 		return k + 1;
- 
--	for (int i = 0, j = k + 1;;) {
-+	for (i = 0, j = k + 1;;) {
- 		const int l = (i + j) >> 1;
- 		if (l > i) {
- 			const int t = list[c[l]].y;
-@@ -265,11 +267,13 @@ static void stone(const int *a, int n, c
- 	int clistlen = 100;
- 	int k = 0;
- 	struct cand *clist = xzalloc(clistlen * sizeof(clist[0]));
-+	struct cand cand;
-+	struct cand *q;
- 	int *klist = xzalloc((n + 2) * sizeof(klist[0]));
- 	/*clist[0] = (struct cand){0}; - xzalloc did it */
- 	/*klist[0] = 0; */
- 
--	for (struct cand cand = {1}; cand.x <= n; cand.x++) {
-+	for (cand.x = 1; cand.x <= n; cand.x++) {
- 		int j = a[cand.x], oldl = 0;
- 		unsigned numtries = 0;
- 		if (j == 0)
-@@ -303,7 +307,7 @@ static void stone(const int *a, int n, c
- 		} while ((cand.y = b[++j]) > 0 && numtries < bound);
- 	}
- 	/* Unravel */
--	for (struct cand *q = clist + klist[k]; q->y; q = clist + q->pred)
-+	for (q = clist + klist[k]; q->y; q = clist + q->pred)
- 		J[q->x + pref] = q->y + pref;
- 	free(klist);
- 	free(clist);
-@@ -348,10 +352,11 @@ static void equiv(struct line *a, int n,
- 
- static void unsort(const struct line *f, int l, int *b)
- {
-+	int i;
- 	int *a = xmalloc((l + 1) * sizeof(a[0]));
--	for (int i = 1; i <= l; i++)
-+	for (i = 1; i <= l; i++)
- 		a[f[i].serial] = f[i].value;
--	for (int i = 1; i <= l; i++)
-+	for (i = 1; i <= l; i++)
- 		b[i] = a[i];
- 	free(a);
- }
-@@ -370,12 +375,13 @@ static int line_compar(const void *a, co
- 
- static void fetch(FILE_and_pos_t *ft, const off_t *ix, int a, int b, int ch)
- {
--	for (int i = a; i <= b; i++) {
-+	int i, j, col;
-+	for (i = a; i <= b; i++) {
- 		seek_ft(ft, ix[i - 1]);
- 		putchar(ch);
- 		if (option_mask32 & FLAG(T))
- 			putchar('\t');
--		for (int j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) {
-+		for (j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) {
- 			int c = fgetc(ft->ft_fp);
- 			if (c == EOF) {
- 				printf("\n\\ No newline at end of file\n");
-@@ -410,19 +416,20 @@ static NOINLINE int *create_J(FILE_and_p
- {
- 	int *J, slen[2], *class, *member;
- 	struct line *nfile[2], *sfile[2];
--	int pref = 0, suff = 0;
-+	int pref = 0, suff = 0, i, j, delta;
- 
- 	/* Lines of both files are hashed, and in the process
- 	 * their offsets are stored in the array ix[fileno]
- 	 * where fileno == 0 points to the old file, and
- 	 * fileno == 1 points to the new one.
- 	 */
--	for (int i = 0; i < 2; i++) {
-+	for (i = 0; i < 2; i++) {
- 		unsigned hash;
- 		token_t tok;
- 		size_t sz = 100;
- 		nfile[i] = xmalloc((sz + 3) * sizeof(nfile[i][0]));
- 		/* ft gets here without the correct position, cant use seek_ft */
-+		ft[i].ft_pos = 0;
- 		fseeko(ft[i].ft_fp, 0, SEEK_SET);
- 
- 		nlen[i] = 0;
-@@ -460,11 +467,11 @@ start:
- 			nlen[i]--;
- 		/* Now we copy the line offsets into ix */
- 		ix[i] = xmalloc((nlen[i] + 2) * sizeof(ix[i][0]));
--		for (int j = 0; j < nlen[i] + 1; j++)
-+		for (j = 0; j < nlen[i] + 1; j++)
- 			ix[i][j] = nfile[i][j].offset;
- 	}
- 
--	/* lenght of prefix and suffix is calculated */
-+	/* length of prefix and suffix is calculated */
- 	for (; pref < nlen[0] && pref < nlen[1] &&
- 	       nfile[0][pref + 1].value == nfile[1][pref + 1].value;
- 	       pref++);
-@@ -475,10 +482,10 @@ start:
- 	 * the result being sorted and stored in sfile[fileno],
- 	 * and their sizes are stored in slen[fileno]
- 	 */
--	for (int j = 0; j < 2; j++) {
-+	for (j = 0; j < 2; j++) {
- 		sfile[j] = nfile[j] + pref;
- 		slen[j] = nlen[j] - pref - suff;
--		for (int i = 0; i <= slen[j]; i++)
-+		for (i = 0; i <= slen[j]; i++)
- 			sfile[j][i].serial = i;
- 		qsort(sfile[j] + 1, slen[j], sizeof(*sfile[j]), line_compar);
- 	}
-@@ -494,7 +501,7 @@ start:
- 	free(nfile[1]);
- 
- 	class = xmalloc((slen[0] + 1) * sizeof(class[0]));
--	for (int i = 1; i <= slen[0]; i++) /* Unsorting */
-+	for (i = 1; i <= slen[0]; i++) /* Unsorting */
- 		class[sfile[0][i].serial] = sfile[0][i].value;
- 	free(nfile[0]);
- #else
-@@ -512,7 +519,7 @@ start:
- 	 * are initialized with 0 (no matches), so that function stone can
- 	 * then assign them their right values
- 	 */
--	for (int i = 0, delta = nlen[1] - nlen[0]; i <= nlen[0]; i++)
-+	for (i = 0, delta = nlen[1] - nlen[0]; i <= nlen[0]; i++)
- 		J[i] = i <= pref            ?  i :
- 		       i > (nlen[0] - suff) ? (i + delta) : 0;
- 	/* Here the magic is performed */
-@@ -526,14 +533,14 @@ start:
- 	 * which, due to limitations intrinsic to any hashing algorithm,
- 	 * are different but ended up confounded as the same
- 	 */
--	for (int i = 1; i <= nlen[0]; i++) {
-+	for (i = 1; i <= nlen[0]; i++) {
- 		if (!J[i])
- 			continue;
- 
- 		seek_ft(&ft[0], ix[0][i - 1]);
- 		seek_ft(&ft[1], ix[1][J[i] - 1]);
- 
--		for (int j = J[i]; i <= nlen[0] && J[i] == j; i++, j++) {
-+		for (j = J[i]; i <= nlen[0] && J[i] == j; i++, j++) {
- 			token_t tok0 = 0, tok1 = 0;
- 			do {
- 				tok0 = read_token(&ft[0], tok0);
-@@ -555,13 +562,18 @@ static bool diff(FILE* fp[2], char *file
- {
- 	int nlen[2];
- 	off_t *ix[2];
--	FILE_and_pos_t ft[2] = { { fp[0] }, { fp[1] } };
--	int *J = create_J(ft, nlen, ix);
--
--	bool anychange = false;
-+	FILE_and_pos_t ft[2];
- 	typedef struct { int a, b; } vec_t[2];
- 	vec_t *vec = NULL;
--	int i = 1, idx = -1;
-+	int i = 1, j, k, idx = -1;
-+	bool anychange = false;
-+	int *J;
-+
-+	ft[0].ft_fp = fp[0];
-+	ft[1].ft_fp = fp[1];
-+	/* note that ft[i].ft_pos is unintitalized, create_J()
-+	 * must not assume otherwise */
-+	J = create_J(ft, nlen, ix);
- 
- 	do {
- 		bool nonempty = false;
-@@ -596,8 +608,8 @@ static bool diff(FILE* fp[2], char *file
- 					break;
- 				}
- 
--				for (int j = 0; j < 2; j++)
--					for (int k = v[j].a; k < v[j].b; k++)
-+				for (j = 0; j < 2; j++)
-+					for (k = v[j].a; k < v[j].b; k++)
- 						nonempty |= (ix[j][k+1] - ix[j][k] != 1);
- 
- 				vec = xrealloc_vector(vec, 6, ++idx);
-@@ -612,6 +624,7 @@ static bool diff(FILE* fp[2], char *file
- 		if (idx < 0 || ((option_mask32 & FLAG(B)) && !nonempty))
- 			goto cont;
- 		if (!(option_mask32 & FLAG(q))) {
-+			int lowa;
- 			vec_t span, *cvp = vec;
- 
- 			if (!anychange) {
-@@ -621,7 +634,7 @@ static bool diff(FILE* fp[2], char *file
- 			}
- 
- 			printf("@@");
--			for (int j = 0; j < 2; j++) {
-+			for (j = 0; j < 2; j++) {
- 				int a = span[j].a = MAX(1, (*cvp)[j].a - opt_U_context);
- 				int b = span[j].b = MIN(nlen[j], vec[idx][j].b + opt_U_context);
- 
-@@ -635,12 +648,12 @@ static bool diff(FILE* fp[2], char *file
- 			 * Output changes in "unified" diff format--the old and new lines
- 			 * are printed together.
- 			 */
--			for (int lowa = span[0].a; ; lowa = (*cvp++)[0].b + 1) {
-+			for (lowa = span[0].a; ; lowa = (*cvp++)[0].b + 1) {
- 				bool end = cvp > &vec[idx];
- 				fetch(&ft[0], ix[0], lowa, end ? span[0].b : (*cvp)[0].a - 1, ' ');
- 				if (end)
- 					break;
--				for (int j = 0; j < 2; j++)
-+				for (j = 0; j < 2; j++)
- 					fetch(&ft[j], ix[j], (*cvp)[j].a, (*cvp)[j].b, j ? '+' : '-');
- 			}
- 		}
-@@ -660,9 +673,9 @@ static int diffreg(char *file[2])
- {
- 	FILE *fp[2] = { stdin, stdin };
- 	bool binary = false, differ = false;
--	int status = STATUS_SAME;
-+	int status = STATUS_SAME, i;
- 
--	for (int i = 0; i < 2; i++) {
-+	for (i = 0; i < 2; i++) {
- 		int fd = open_or_warn_stdin(file[i]);
- 		if (fd == -1)
- 			goto out;
-@@ -688,7 +701,7 @@ static int diffreg(char *file[2])
- 		const size_t sz = COMMON_BUFSIZE / 2;
- 		char *const buf0 = bb_common_bufsiz1;
- 		char *const buf1 = buf0 + sz;
--		int i, j;
-+		int j, k;
- 		i = fread(buf0, 1, sz, fp[0]);
- 		j = fread(buf1, 1, sz, fp[1]);
- 		if (i != j) {
-@@ -697,7 +710,7 @@ static int diffreg(char *file[2])
- 		}
- 		if (i == 0)
- 			break;
--		for (int k = 0; k < i; k++) {
-+		for (k = 0; k < i; k++) {
- 			if (!buf0[k] || !buf1[k])
- 				binary = true;
- 			if (buf0[k] != buf1[k])
-@@ -771,9 +784,10 @@ static int FAST_FUNC skip_dir(const char
- static void diffdir(char *p[2], const char *s_start)
- {
- 	struct dlist list[2];
-+	int i;
- 
- 	memset(&list, 0, sizeof(list));
--	for (int i = 0; i < 2; i++) {
-+	for (i = 0; i < 2; i++) {
- 		/*list[i].s = list[i].e = 0; - memset did it */
- 		/*list[i].dl = NULL; */
- 
-@@ -815,7 +829,7 @@ static void diffdir(char *p[2], const ch
- 		else {
- 			char *fullpath[2], *path[2]; /* if -N */
- 
--			for (int i = 0; i < 2; i++) {
-+			for (i = 0; i < 2; i++) {
- 				if (pos == 0 || i == k) {
- 					path[i] = fullpath[i] = concat_path_file(p[i], dp[i]);
- 					stat(fullpath[i], &stb[i]);
-@@ -883,7 +897,7 @@ static const char diff_longopts[] ALIGN1
- int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int diff_main(int argc UNUSED_PARAM, char **argv)
- {
--	int gotstdin = 0;
-+	int gotstdin = 0, i;
- 	char *file[2], *s_start = NULL;
- 	llist_t *L_arg = NULL;
- 
-@@ -900,7 +914,7 @@ int diff_main(int argc UNUSED_PARAM, cha
- 	while (L_arg)
- 		label[!!label[0]] = llist_pop(&L_arg);
- 	xfunc_error_retval = 2;
--	for (int i = 0; i < 2; i++) {
-+	for (i = 0; i < 2; i++) {
- 		file[i] = argv[i];
- 		/* Compat: "diff file name_which_doesnt_exist" exits with 2 */
- 		if (LONE_DASH(file[i])) {
-diff -urpN busybox-1.16.0/miscutils/fbsplash.c busybox-1.16.0-compat/miscutils/fbsplash.c
---- busybox-1.16.0/miscutils/fbsplash.c	2010-01-25 01:59:38.000000000 +0100
-+++ busybox-1.16.0-compat/miscutils/fbsplash.c	2010-02-21 01:54:07.000000000 +0100
-@@ -301,7 +301,7 @@ static void fb_drawimage(void)
-  */
- static void init(const char *cfg_filename)
- {
--	static const char const param_names[] ALIGN1 =
-+	static const char param_names[] ALIGN1 =
- 		"BAR_WIDTH\0" "BAR_HEIGHT\0"
- 		"BAR_LEFT\0" "BAR_TOP\0"
- 		"BAR_R\0" "BAR_G\0" "BAR_B\0"

package/busybox/busybox-1.16.0-defconfig.patch

@@ -1,438 +0,0 @@
-diff -urpN busybox-1.16.0/scripts/defconfig busybox-1.16.0-defconfig/scripts/defconfig
---- busybox-1.16.0/scripts/defconfig	2010-01-25 01:59:38.000000000 +0100
-+++ busybox-1.16.0-defconfig/scripts/defconfig	2010-02-21 01:53:15.000000000 +0100
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Busybox version: 1.15.0.svn
--# Fri Aug 21 00:14:11 2009
-+# Busybox version: 1.16.0
-+# Wed Jan 27 20:00:00 2010
- #
- CONFIG_HAVE_DOT_CONFIG=y
- 
-@@ -14,6 +14,8 @@ CONFIG_HAVE_DOT_CONFIG=y
- #
- # CONFIG_DESKTOP is not set
- # CONFIG_EXTRA_COMPAT is not set
-+CONFIG_INCLUDE_SUSv2=y
-+# CONFIG_USE_PORTABLE_CODE is not set
- CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
- # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
- # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-@@ -22,7 +24,7 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
- CONFIG_FEATURE_COMPRESS_USAGE=y
- CONFIG_FEATURE_INSTALLER=y
- CONFIG_LOCALE_SUPPORT=y
--# CONFIG_FEATURE_ASSUME_UNICODE is not set
-+CONFIG_FEATURE_ASSUME_UNICODE=y
- # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
- CONFIG_LONG_OPTS=y
- CONFIG_FEATURE_DEVPTS=y
-@@ -59,7 +61,6 @@ CONFIG_EXTRA_CFLAGS=""
- CONFIG_NO_DEBUG_LIB=y
- # CONFIG_DMALLOC is not set
- # CONFIG_EFENCE is not set
--CONFIG_INCLUDE_SUSv2=y
- 
- #
- # Installation Options
-@@ -120,10 +121,11 @@ CONFIG_FEATURE_CPIO_P=y
- # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
- CONFIG_GUNZIP=y
- CONFIG_GZIP=y
-+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
- CONFIG_LZOP=y
- # CONFIG_LZOP_COMPR_HIGH is not set
--# CONFIG_RPM2CPIO is not set
--# CONFIG_RPM is not set
-+CONFIG_RPM2CPIO=y
-+CONFIG_RPM=y
- CONFIG_TAR=y
- CONFIG_FEATURE_TAR_CREATE=y
- CONFIG_FEATURE_TAR_AUTODETECT=y
-@@ -133,6 +135,7 @@ CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=
- CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
- CONFIG_FEATURE_TAR_LONG_OPTIONS=y
- CONFIG_FEATURE_TAR_UNAME_GNAME=y
-+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
- CONFIG_UNCOMPRESS=y
- CONFIG_UNLZMA=y
- CONFIG_FEATURE_LZMA_FAST=y
-@@ -148,15 +151,19 @@ CONFIG_CATV=y
- CONFIG_CHGRP=y
- CONFIG_CHMOD=y
- CONFIG_CHOWN=y
-+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
- CONFIG_CHROOT=y
- CONFIG_CKSUM=y
- CONFIG_COMM=y
- CONFIG_CP=y
-+CONFIG_FEATURE_CP_LONG_OPTIONS=y
- CONFIG_CUT=y
- CONFIG_DATE=y
- CONFIG_FEATURE_DATE_ISOFMT=y
-+CONFIG_FEATURE_DATE_COMPAT=y
- CONFIG_DD=y
- CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
- CONFIG_FEATURE_DD_IBS_OBS=y
- CONFIG_DF=y
- CONFIG_FEATURE_DF_FANCY=y
-@@ -271,7 +278,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
- CONFIG_FEATURE_HUMAN_READABLE=y
- 
- #
--# Common options for md5sum, sha1sum
-+# Common options for md5sum, sha1sum, sha256sum, sha512sum
- #
- CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
- 
-@@ -318,9 +325,8 @@ CONFIG_AWK=y
- CONFIG_FEATURE_AWK_LIBM=y
- CONFIG_CMP=y
- CONFIG_DIFF=y
--CONFIG_FEATURE_DIFF_BINARY=y
-+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
- CONFIG_FEATURE_DIFF_DIR=y
--CONFIG_FEATURE_DIFF_MINIMAL=y
- CONFIG_ED=y
- CONFIG_PATCH=y
- CONFIG_SED=y
-@@ -364,6 +370,7 @@ CONFIG_FEATURE_FIND_DELETE=y
- CONFIG_FEATURE_FIND_PATH=y
- CONFIG_FEATURE_FIND_REGEX=y
- # CONFIG_FEATURE_FIND_CONTEXT is not set
-+CONFIG_FEATURE_FIND_LINKS=y
- CONFIG_GREP=y
- CONFIG_FEATURE_GREP_EGREP_ALIAS=y
- CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-@@ -453,6 +460,7 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALRE
- # Options common to multiple modutils
- #
- # CONFIG_FEATURE_2_4_MODULES is not set
-+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
- # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
- # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
- # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-@@ -467,8 +475,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
- #
- # Linux System Utilities
- #
--# CONFIG_ACPID is not set
--# CONFIG_FEATURE_ACPID_COMPAT is not set
-+CONFIG_ACPID=y
-+CONFIG_FEATURE_ACPID_COMPAT=y
- CONFIG_BLKID=y
- CONFIG_DMESG=y
- CONFIG_FEATURE_DMESG_PRETTY=y
-@@ -488,12 +496,14 @@ CONFIG_FEATURE_FDISK_ADVANCED=y
- CONFIG_FINDFS=y
- CONFIG_FREERAMDISK=y
- CONFIG_FSCK_MINIX=y
-+CONFIG_MKFS_EXT2=y
- CONFIG_MKFS_MINIX=y
- 
- #
- # Minix filesystem support
- #
- CONFIG_FEATURE_MINIX2=y
-+# CONFIG_MKFS_REISER is not set
- CONFIG_MKFS_VFAT=y
- CONFIG_GETOPT=y
- CONFIG_FEATURE_GETOPT_LONG=y
-@@ -506,6 +516,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
- CONFIG_IPCRM=y
- CONFIG_IPCS=y
- CONFIG_LOSETUP=y
-+CONFIG_LSPCI=y
-+CONFIG_LSUSB=y
- CONFIG_MDEV=y
- CONFIG_FEATURE_MDEV_CONF=y
- CONFIG_FEATURE_MDEV_RENAME=y
-@@ -518,6 +530,7 @@ CONFIG_MORE=y
- CONFIG_FEATURE_USE_TERMIOS=y
- CONFIG_VOLUMEID=y
- CONFIG_FEATURE_VOLUMEID_EXT=y
-+CONFIG_FEATURE_VOLUMEID_BTRFS=y
- CONFIG_FEATURE_VOLUMEID_REISERFS=y
- CONFIG_FEATURE_VOLUMEID_FAT=y
- CONFIG_FEATURE_VOLUMEID_HFS=y
-@@ -595,11 +608,12 @@ CONFIG_DEVMEM=y
- CONFIG_EJECT=y
- CONFIG_FEATURE_EJECT_SCSI=y
- CONFIG_FBSPLASH=y
--# CONFIG_FLASH_LOCK is not set
--# CONFIG_FLASH_UNLOCK is not set
--# CONFIG_FLASH_ERASEALL is not set
-+CONFIG_FLASHCP=y
-+CONFIG_FLASH_LOCK=y
-+CONFIG_FLASH_UNLOCK=y
-+CONFIG_FLASH_ERASEALL=y
- CONFIG_IONICE=y
--# CONFIG_INOTIFYD is not set
-+CONFIG_INOTIFYD=y
- CONFIG_LAST=y
- # CONFIG_FEATURE_LAST_SMALL is not set
- CONFIG_FEATURE_LAST_FANCY=y
-@@ -632,8 +646,8 @@ CONFIG_RUNLEVEL=y
- CONFIG_RX=y
- CONFIG_SETSID=y
- CONFIG_STRINGS=y
--# CONFIG_TASKSET is not set
--# CONFIG_FEATURE_TASKSET_FANCY is not set
-+CONFIG_TASKSET=y
-+CONFIG_FEATURE_TASKSET_FANCY=y
- CONFIG_TIME=y
- CONFIG_TIMEOUT=y
- CONFIG_TTYSIZE=y
-@@ -658,6 +672,7 @@ CONFIG_ETHER_WAKE=y
- CONFIG_FAKEIDENTD=y
- CONFIG_FTPD=y
- CONFIG_FEATURE_FTP_WRITE=y
-+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
- CONFIG_FTPGET=y
- CONFIG_FTPPUT=y
- CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
-@@ -723,6 +738,8 @@ CONFIG_NETSTAT=y
- CONFIG_FEATURE_NETSTAT_WIDE=y
- CONFIG_FEATURE_NETSTAT_PRG=y
- CONFIG_NSLOOKUP=y
-+CONFIG_NTPD=y
-+CONFIG_FEATURE_NTPD_SERVER=y
- CONFIG_PING=y
- CONFIG_PING6=y
- CONFIG_FEATURE_FANCY_PING=y
-@@ -734,13 +751,16 @@ CONFIG_FEATURE_TELNET_TTYPE=y
- CONFIG_FEATURE_TELNET_AUTOLOGIN=y
- CONFIG_TELNETD=y
- CONFIG_FEATURE_TELNETD_STANDALONE=y
-+CONFIG_FEATURE_TELNETD_INETD_WAIT=y
- CONFIG_TFTP=y
- CONFIG_TFTPD=y
- CONFIG_FEATURE_TFTP_GET=y
- CONFIG_FEATURE_TFTP_PUT=y
- CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
- # CONFIG_TFTP_DEBUG is not set
- CONFIG_TRACEROUTE=y
-+CONFIG_TRACEROUTE6=y
- CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
- # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
- # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-@@ -814,6 +834,7 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
- CONFIG_FEATURE_TOP_DECIMALS=y
- CONFIG_FEATURE_TOP_SMP_PROCESS=y
- CONFIG_FEATURE_TOPMEM=y
-+CONFIG_FEATURE_SHOW_THREADS=y
- CONFIG_UPTIME=y
- CONFIG_WATCH=y
- 
-@@ -878,6 +899,7 @@ CONFIG_HUSH_CASE=y
- CONFIG_HUSH_FUNCTIONS=y
- CONFIG_HUSH_LOCAL=y
- CONFIG_HUSH_EXPORT_N=y
-+CONFIG_HUSH_RANDOM_SUPPORT=y
- # CONFIG_LASH is not set
- CONFIG_MSH=y
- CONFIG_SH_MATH_SUPPORT=y
-diff -urpN busybox-1.16.0/TODO_config_nommu busybox-1.16.0-defconfig/TODO_config_nommu
---- busybox-1.16.0/TODO_config_nommu	2010-01-25 01:59:38.000000000 +0100
-+++ busybox-1.16.0-defconfig/TODO_config_nommu	2010-02-21 01:53:15.000000000 +0100
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Busybox version: 1.15.0.svn
--# Fri Aug 21 00:13:18 2009
-+# Busybox version: 1.16.0
-+# Wed Jan 27 21:01:26 2010
- #
- CONFIG_HAVE_DOT_CONFIG=y
- 
-@@ -14,6 +14,8 @@ CONFIG_HAVE_DOT_CONFIG=y
- #
- CONFIG_DESKTOP=y
- CONFIG_EXTRA_COMPAT=y
-+CONFIG_INCLUDE_SUSv2=y
-+# CONFIG_USE_PORTABLE_CODE is not set
- CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
- # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
- # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-@@ -59,7 +61,6 @@ CONFIG_EXTRA_CFLAGS=""
- CONFIG_NO_DEBUG_LIB=y
- # CONFIG_DMALLOC is not set
- # CONFIG_EFENCE is not set
--CONFIG_INCLUDE_SUSv2=y
- 
- #
- # Installation Options
-@@ -120,6 +121,7 @@ CONFIG_DPKG_DEB=y
- CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
- CONFIG_GUNZIP=y
- CONFIG_GZIP=y
-+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
- CONFIG_LZOP=y
- CONFIG_LZOP_COMPR_HIGH=y
- CONFIG_RPM2CPIO=y
-@@ -133,6 +135,7 @@ CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=
- CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
- CONFIG_FEATURE_TAR_LONG_OPTIONS=y
- CONFIG_FEATURE_TAR_UNAME_GNAME=y
-+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
- CONFIG_UNCOMPRESS=y
- CONFIG_UNLZMA=y
- CONFIG_FEATURE_LZMA_FAST=y
-@@ -148,15 +151,19 @@ CONFIG_CATV=y
- CONFIG_CHGRP=y
- CONFIG_CHMOD=y
- CONFIG_CHOWN=y
-+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
- CONFIG_CHROOT=y
- CONFIG_CKSUM=y
- CONFIG_COMM=y
- CONFIG_CP=y
-+CONFIG_FEATURE_CP_LONG_OPTIONS=y
- CONFIG_CUT=y
- CONFIG_DATE=y
- CONFIG_FEATURE_DATE_ISOFMT=y
-+CONFIG_FEATURE_DATE_COMPAT=y
- CONFIG_DD=y
- CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
- CONFIG_FEATURE_DD_IBS_OBS=y
- CONFIG_DF=y
- CONFIG_FEATURE_DF_FANCY=y
-@@ -271,7 +278,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
- CONFIG_FEATURE_HUMAN_READABLE=y
- 
- #
--# Common options for md5sum, sha1sum
-+# Common options for md5sum, sha1sum, sha256sum, sha512sum
- #
- CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
- 
-@@ -318,9 +325,8 @@ CONFIG_AWK=y
- CONFIG_FEATURE_AWK_LIBM=y
- CONFIG_CMP=y
- CONFIG_DIFF=y
--CONFIG_FEATURE_DIFF_BINARY=y
-+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
- CONFIG_FEATURE_DIFF_DIR=y
--CONFIG_FEATURE_DIFF_MINIMAL=y
- CONFIG_ED=y
- CONFIG_PATCH=y
- CONFIG_SED=y
-@@ -364,6 +370,7 @@ CONFIG_FEATURE_FIND_DELETE=y
- CONFIG_FEATURE_FIND_PATH=y
- CONFIG_FEATURE_FIND_REGEX=y
- CONFIG_FEATURE_FIND_CONTEXT=y
-+CONFIG_FEATURE_FIND_LINKS=y
- CONFIG_GREP=y
- CONFIG_FEATURE_GREP_EGREP_ALIAS=y
- CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-@@ -453,6 +460,7 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALRE
- # Options common to multiple modutils
- #
- # CONFIG_FEATURE_2_4_MODULES is not set
-+CONFIG_FEATURE_INSMOD_TRY_MMAP=y
- # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
- # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
- # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-@@ -488,12 +496,14 @@ CONFIG_FEATURE_FDISK_ADVANCED=y
- CONFIG_FINDFS=y
- CONFIG_FREERAMDISK=y
- CONFIG_FSCK_MINIX=y
-+CONFIG_MKFS_EXT2=y
- CONFIG_MKFS_MINIX=y
- 
- #
- # Minix filesystem support
- #
- CONFIG_FEATURE_MINIX2=y
-+CONFIG_MKFS_REISER=y
- CONFIG_MKFS_VFAT=y
- CONFIG_GETOPT=y
- CONFIG_FEATURE_GETOPT_LONG=y
-@@ -506,6 +516,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
- CONFIG_IPCRM=y
- CONFIG_IPCS=y
- CONFIG_LOSETUP=y
-+CONFIG_LSPCI=y
-+CONFIG_LSUSB=y
- CONFIG_MDEV=y
- CONFIG_FEATURE_MDEV_CONF=y
- CONFIG_FEATURE_MDEV_RENAME=y
-@@ -518,6 +530,7 @@ CONFIG_MORE=y
- CONFIG_FEATURE_USE_TERMIOS=y
- CONFIG_VOLUMEID=y
- CONFIG_FEATURE_VOLUMEID_EXT=y
-+CONFIG_FEATURE_VOLUMEID_BTRFS=y
- CONFIG_FEATURE_VOLUMEID_REISERFS=y
- CONFIG_FEATURE_VOLUMEID_FAT=y
- CONFIG_FEATURE_VOLUMEID_HFS=y
-@@ -595,6 +608,7 @@ CONFIG_DEVMEM=y
- CONFIG_EJECT=y
- CONFIG_FEATURE_EJECT_SCSI=y
- CONFIG_FBSPLASH=y
-+CONFIG_FLASHCP=y
- # CONFIG_FLASH_LOCK is not set
- # CONFIG_FLASH_UNLOCK is not set
- # CONFIG_FLASH_ERASEALL is not set
-@@ -638,6 +652,7 @@ CONFIG_TIME=y
- CONFIG_TIMEOUT=y
- CONFIG_TTYSIZE=y
- CONFIG_VOLNAME=y
-+CONFIG_WALL=y
- CONFIG_WATCHDOG=y
- 
- #
-@@ -657,6 +672,7 @@ CONFIG_ETHER_WAKE=y
- CONFIG_FAKEIDENTD=y
- CONFIG_FTPD=y
- CONFIG_FEATURE_FTP_WRITE=y
-+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
- CONFIG_FTPGET=y
- CONFIG_FTPPUT=y
- CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
-@@ -722,6 +738,8 @@ CONFIG_NETSTAT=y
- CONFIG_FEATURE_NETSTAT_WIDE=y
- CONFIG_FEATURE_NETSTAT_PRG=y
- CONFIG_NSLOOKUP=y
-+CONFIG_NTPD=y
-+CONFIG_FEATURE_NTPD_SERVER=y
- CONFIG_PING=y
- CONFIG_PING6=y
- CONFIG_FEATURE_FANCY_PING=y
-@@ -733,13 +751,16 @@ CONFIG_FEATURE_TELNET_TTYPE=y
- CONFIG_FEATURE_TELNET_AUTOLOGIN=y
- CONFIG_TELNETD=y
- CONFIG_FEATURE_TELNETD_STANDALONE=y
-+CONFIG_FEATURE_TELNETD_INETD_WAIT=y
- CONFIG_TFTP=y
- CONFIG_TFTPD=y
- CONFIG_FEATURE_TFTP_GET=y
- CONFIG_FEATURE_TFTP_PUT=y
- CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
- CONFIG_TFTP_DEBUG=y
- CONFIG_TRACEROUTE=y
-+CONFIG_TRACEROUTE6=y
- CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
- CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
- CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
-@@ -813,6 +834,7 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
- CONFIG_FEATURE_TOP_DECIMALS=y
- CONFIG_FEATURE_TOP_SMP_PROCESS=y
- CONFIG_FEATURE_TOPMEM=y
-+CONFIG_FEATURE_SHOW_THREADS=y
- CONFIG_UPTIME=y
- CONFIG_WATCH=y
- 
-@@ -881,6 +903,7 @@ CONFIG_HUSH_CASE=y
- CONFIG_HUSH_FUNCTIONS=y
- CONFIG_HUSH_LOCAL=y
- CONFIG_HUSH_EXPORT_N=y
-+CONFIG_HUSH_RANDOM_SUPPORT=y
- CONFIG_LASH=y
- CONFIG_MSH=y
- CONFIG_SH_MATH_SUPPORT=y

package/busybox/busybox-1.16.0-linux_swap.patch

@@ -1,16 +0,0 @@
-diff -urpN busybox-1.16.0/util-linux/volume_id/linux_swap.c busybox-1.16.0-linux_swap/util-linux/volume_id/linux_swap.c
---- busybox-1.16.0/util-linux/volume_id/linux_swap.c	2010-01-25 01:59:39.000000000 +0100
-+++ busybox-1.16.0-linux_swap/util-linux/volume_id/linux_swap.c	2010-02-21 01:53:21.000000000 +0100
-@@ -52,7 +52,11 @@ int FAST_FUNC volume_id_probe_linux_swap
- 				goto found;
- 			}
- 
--			if (memcmp(buf, "SWAPSPACE2", 10) == 0) {
-+			if (memcmp(buf, "SWAPSPACE2", 10) == 0
-+			 || memcmp(buf, "S1SUSPEND", 9) == 0
-+			 || memcmp(buf, "S2SUSPEND", 9) == 0
-+			 || memcmp(buf, "ULSUSPEND", 9) == 0
-+			) {
- 				sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
- 				if (sw == NULL)
- 					return -1;

package/busybox/busybox-1.16.0-md5_sha_compat.patch

@@ -1,16 +0,0 @@
-diff -urpN busybox-1.16.0/coreutils/md5_sha1_sum.c busybox-1.16.0-md5_sha_compat/coreutils/md5_sha1_sum.c
---- busybox-1.16.0/coreutils/md5_sha1_sum.c	2010-01-25 01:59:38.000000000 +0100
-+++ busybox-1.16.0-md5_sha_compat/coreutils/md5_sha1_sum.c	2010-02-21 01:53:28.000000000 +0100
-@@ -101,8 +101,10 @@ int md5_sha1_sum_main(int argc UNUSED_PA
- 	unsigned flags;
- 	/*hash_algo_t hash_algo = applet_name[3];*/
- 
--	if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK)
--		flags = getopt32(argv, "scw");
-+	if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK) {
-+		/* -b "binary", -t "text" are ignored (shaNNNsum compat) */
-+		flags = getopt32(argv, "scwbt");
-+	}
- 	else optind = 1;
- 	argv += optind;
- 	//argc -= optind;

package/busybox/busybox-1.16.0-syslogd.patch

@@ -1,12 +0,0 @@
-diff -urpN busybox-1.16.0/sysklogd/syslogd.c busybox-1.16.0-syslogd/sysklogd/syslogd.c
---- busybox-1.16.0/sysklogd/syslogd.c	2010-01-25 01:59:38.000000000 +0100
-+++ busybox-1.16.0-syslogd/sysklogd/syslogd.c	2010-02-21 01:53:33.000000000 +0100
-@@ -698,7 +698,7 @@ int syslogd_main(int argc UNUSED_PARAM, 
- 	if (!(opts & OPT_nofork)) {
- 		bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
- 	}
--	umask(0);
-+	//umask(0); - why??
- 	write_pidfile("/var/run/syslogd.pid");
- 	do_syslogd();
- 	/* return EXIT_SUCCESS; */

package/busybox/busybox-1.16.0-tftp.patch

@@ -1,12 +0,0 @@
-diff -urpN busybox-1.16.0/networking/tftp.c busybox-1.16.0-tftp/networking/tftp.c
---- busybox-1.16.0/networking/tftp.c	2010-01-25 01:59:38.000000000 +0100
-+++ busybox-1.16.0-tftp/networking/tftp.c	2010-02-21 01:53:41.000000000 +0100
-@@ -308,7 +308,7 @@ static int tftp_protocol(
- 
- 	if (!ENABLE_TFTP || our_lsa) { /* tftpd */
- 		/* Open file (must be after changing user) */
--		local_fd = open(local_file, open_mode);
-+		local_fd = open(local_file, open_mode, 0666);
- 		if (local_fd < 0) {
- 			error_pkt_reason = ERR_NOFILE;
- 			strcpy((char*)error_pkt_str, "can't open file");

package/busybox/busybox-1.16.0-wget.patch

@@ -1,20 +0,0 @@
-diff -urpN busybox-1.16.0/networking/wget.c busybox-1.16.0-wget/networking/wget.c
---- busybox-1.16.0/networking/wget.c	2010-01-25 01:59:38.000000000 +0100
-+++ busybox-1.16.0-wget/networking/wget.c	2010-02-21 01:53:53.000000000 +0100
-@@ -546,6 +546,8 @@ int wget_main(int argc UNUSED_PARAM, cha
- 		"passive-ftp\0"      No_argument       "\xff"
- 		"header\0"           Required_argument "\xfe"
- 		"post-data\0"        Required_argument "\xfd"
-+		/* Ignored (we don't do ssl) */
-+		"no-check-certificate\0" No_argument   "\xfc"
- 		;
- #endif
- 
-@@ -590,6 +592,7 @@ int wget_main(int argc UNUSED_PARAM, cha
- 	if (use_proxy) {
- 		proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
- 		if (proxy && proxy[0]) {
-+			server.user = NULL;
- 			parse_url(proxy, &server);
- 		} else {
- 			use_proxy = 0;

package/busybox/busybox-1.16.1-ash.patch

@@ -0,0 +1,15 @@
+diff -urpN busybox-1.16.1/shell/ash.c busybox-1.16.1-ash/shell/ash.c
+--- busybox-1.16.1/shell/ash.c	2010-03-28 19:44:04.000000000 +0200
++++ busybox-1.16.1-ash/shell/ash.c	2010-04-26 14:18:36.000000000 +0200
+@@ -5424,7 +5424,11 @@ rmescapes(char *str, int flag)
+ 		size_t fulllen = len + strlen(p) + 1;
+ 
+ 		if (flag & RMESCAPE_GROW) {
++			int strloc = str - (char *)stackblock();
+ 			r = makestrspace(fulllen, expdest);
++			/* p and str may be invalidated by makestrspace */
++			str = (char *)stackblock() + strloc;
++			p = str + len;
+ 		} else if (flag & RMESCAPE_HEAP) {
+ 			r = ckmalloc(fulllen);
+ 		} else {

package/busybox/busybox-1.16.1-cpio.patch

@@ -0,0 +1,51 @@
+diff -urpN busybox-1.16.1/archival/cpio.c busybox-1.16.1-cpio/archival/cpio.c
+--- busybox-1.16.1/archival/cpio.c	2010-03-20 03:58:07.000000000 +0100
++++ busybox-1.16.1-cpio/archival/cpio.c	2010-04-27 08:15:37.000000000 +0200
+@@ -424,7 +424,7 @@ int cpio_main(int argc UNUSED_PARAM, cha
+ 	if (archive_handle->cpio__blocks != (off_t)-1
+ 	 && !(opt & CPIO_OPT_QUIET)
+ 	) {
+-		printf("%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
++		fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
+ 	}
+ 
+ 	return EXIT_SUCCESS;
+diff -urpN busybox-1.16.1/testsuite/cpio.tests busybox-1.16.1-cpio/testsuite/cpio.tests
+--- busybox-1.16.1/testsuite/cpio.tests	2010-03-28 19:59:59.000000000 +0200
++++ busybox-1.16.1-cpio/testsuite/cpio.tests	2010-04-27 08:15:37.000000000 +0200
+@@ -32,7 +32,7 @@ rm -rf cpio.testdir cpio.testdir2 2>/dev
+ # testing "test name" "command" "expected result" "file input" "stdin"
+ 
+ testing "cpio extracts zero-sized hardlinks" \
+-"$ECHO -ne '$hexdump' | bzcat | cpio -i; echo \$?;
++"$ECHO -ne '$hexdump' | bzcat | cpio -i 2>&1; echo \$?;
+ ls -ln cpio.testdir | $FILTER_LS" \
+ "\
+ 1 blocks
+@@ -45,7 +45,7 @@ ls -ln cpio.testdir | $FILTER_LS" \
+ 
+ test x"$SKIP_KNOWN_BUGS" = x"" && {
+ # Currently fails. Numerous buglets: "1 blocks" versus "1 block",
+-# "1 block" must go to stderr, does not list cpio.testdir/x and cpio.testdir/y
++# does not list cpio.testdir/x and cpio.testdir/y
+ testing "cpio lists hardlinks" \
+ "$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \
+ "\
+@@ -70,7 +70,7 @@ ln cpio.testdir/nonempty cpio.testdir/no
+ mkdir cpio.testdir2
+ 
+ testing "cpio extracts zero-sized hardlinks 2" \
+-"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i); echo \$?;
++"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i 2>&1); echo \$?;
+ ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
+ "\
+ 2 blocks
+@@ -87,7 +87,7 @@ ls -ln cpio.testdir2/cpio.testdir | $FIL
+ # Was trying to create "/usr/bin", correct is "usr/bin".
+ rm -rf cpio.testdir
+ testing "cpio -p with absolute paths" \
+-"echo /usr/bin | cpio -dp cpio.testdir; echo \$?;
++"echo /usr/bin | cpio -dp cpio.testdir 2>&1; echo \$?;
+ ls cpio.testdir" \
+ "\
+ 1 blocks

package/busybox/busybox-1.16.1-dnsd.patch

@@ -0,0 +1,48 @@
+diff -urpN busybox-1.16.1/include/platform.h busybox-1.16.1-dnsd/include/platform.h
+--- busybox-1.16.1/include/platform.h	2010-03-28 19:43:35.000000000 +0200
++++ busybox-1.16.1-dnsd/include/platform.h	2010-04-14 19:06:10.000000000 +0200
+@@ -291,10 +291,12 @@ typedef unsigned smalluint;
+ #if 1 /* if needed: !defined(arch1) && !defined(arch2) */
+ # define ALIGN1 __attribute__((aligned(1)))
+ # define ALIGN2 __attribute__((aligned(2)))
++# define ALIGN4 __attribute__((aligned(4)))
+ #else
+ /* Arches which MUST have 2 or 4 byte alignment for everything are here */
+ # define ALIGN1
+ # define ALIGN2
++# define ALIGN4
+ #endif
+ 
+ 
+diff -urpN busybox-1.16.1/networking/dnsd.c busybox-1.16.1-dnsd/networking/dnsd.c
+--- busybox-1.16.1/networking/dnsd.c	2010-03-28 19:43:36.000000000 +0200
++++ busybox-1.16.1-dnsd/networking/dnsd.c	2010-04-26 14:20:25.000000000 +0200
+@@ -44,10 +44,15 @@ struct dns_head {
+ 	uint16_t nauth;
+ 	uint16_t nadd;
+ };
++/* Structure used to access type and class fields.
++ * They are totally unaligned, but gcc 4.3.4 thinks that pointer of type uint16_t*
++ * is 16-bit aligned and replaces 16-bit memcpy (in move_from_unaligned16 macro)
++ * with aligned halfword access on arm920t!
++ * Oh well. Slapping PACKED everywhere seems to help: */
+ struct dns_prop {
+-	uint16_t type;
+-	uint16_t class;
+-};
++	uint16_t type PACKED;
++	uint16_t class PACKED;
++} PACKED;
+ /* element of known name, ip address and reversed ip address */
+ struct dns_entry {
+ 	struct dns_entry *next;
+@@ -459,7 +464,8 @@ int dnsd_main(int argc UNUSED_PARAM, cha
+ 	unsigned lsa_size;
+ 	int udps, opts;
+ 	uint16_t port = 53;
+-	uint8_t buf[MAX_PACK_LEN + 1];
++	/* Ensure buf is 32bit aligned (we need 16bit, but 32bit can't hurt) */
++	uint8_t buf[MAX_PACK_LEN + 1] ALIGN4;
+ 
+ 	opts = getopt32(argv, "vi:c:t:p:d", &listen_interface, &fileconf, &sttl, &sport);
+ 	//if (opts & 0x1) // -v

package/busybox/busybox-1.16.1-hwclock.patch

@@ -0,0 +1,152 @@
+diff -urpN busybox-1.16.1/util-linux/hwclock.c busybox-1.16.1-hwclock/util-linux/hwclock.c
+--- busybox-1.16.1/util-linux/hwclock.c	2010-03-19 19:58:07.000000000 -0700
++++ busybox-1.16.1-hwclock/util-linux/hwclock.c	2010-04-14 09:29:37.889208237 -0700
+@@ -109,10 +109,53 @@ static void to_sys_clock(const char **pp
+ 
+ static void from_sys_clock(const char **pp_rtcname, int utc)
+ {
+-#define TWEAK_USEC 200
+-	struct tm tm_time;
++#if 1
+ 	struct timeval tv;
++	struct tm tm_time;
++	int rtc;
++
++	rtc = rtc_xopen(pp_rtcname, O_WRONLY);
++	gettimeofday(&tv, NULL);
++	/* Prepare tm_time */
++	if (sizeof(time_t) == sizeof(tv.tv_sec)) {
++		if (utc)
++			gmtime_r((time_t*)&tv.tv_sec, &tm_time);
++		else
++			localtime_r((time_t*)&tv.tv_sec, &tm_time);
++	} else {
++		time_t t = tv.tv_sec;
++		if (utc)
++			gmtime_r(&t, &tm_time);
++		else
++			localtime_r(&t, &tm_time);
++	}
++#else
++/* Bloated code which tries to set hw clock with better precision.
++ * On x86, even though code does set hw clock within <1ms of exact
++ * whole seconds, apparently hw clock (at least on some machines)
++ * doesn't reset internal fractional seconds to 0,
++ * making all this a pointless excercise.
++ */
++	/* If we see that we are N usec away from whole second,
++	 * we'll sleep for N-ADJ usecs. ADJ corrects for the fact
++	 * that CPU is not infinitely fast.
++	 * On infinitely fast CPU, next wakeup would be
++	 * on (exactly_next_whole_second - ADJ). On real CPUs,
++	 * this difference between current time and whole second
++	 * is less than ADJ (assuming system isn't heavily loaded).
++	 */
++	/* Small value of 256us gives very precise sync for 2+ GHz CPUs.
++	 * Slower CPUs will fail to sync and will go to bigger
++	 * ADJ values. qemu-emulated armv4tl with ~100 MHz
++	 * performance ends up using ADJ ~= 4*1024 and it takes
++	 * 2+ secs (2 tries with successively larger ADJ)
++	 * to sync. Even straced one on the same qemu (very slow)
++	 * takes only 4 tries.
++	 */
++#define TWEAK_USEC 256
+ 	unsigned adj = TWEAK_USEC;
++	struct tm tm_time;
++	struct timeval tv;
+ 	int rtc = rtc_xopen(pp_rtcname, O_WRONLY);
+ 
+ 	/* Try to catch the moment when whole second is close */
+@@ -124,55 +167,64 @@ static void from_sys_clock(const char **
+ 
+ 		t = tv.tv_sec;
+ 		rem_usec = 1000000 - tv.tv_usec;
+-		if (rem_usec < 1024) {
+-			/* Less than 1ms to next second. Good enough */
++		if (rem_usec < adj) {
++			/* Close enough */
+  small_rem:
+ 			t++;
+ 		}
+ 
+-		/* Prepare tm */
++		/* Prepare tm_time from t */
+ 		if (utc)
+ 			gmtime_r(&t, &tm_time); /* may read /etc/xxx (it takes time) */
+ 		else
+ 			localtime_r(&t, &tm_time); /* same */
+-		tm_time.tm_isdst = 0;
++
++		if (adj >= 32*1024) {
++			break; /* 32 ms diff and still no luck?? give up trying to sync */
++		}
+ 
+ 		/* gmtime/localtime took some time, re-get cur time */
+ 		gettimeofday(&tv, NULL);
+ 
+-		if (tv.tv_sec < t /* may happen if rem_usec was < 1024 */
+-		 || (tv.tv_sec == t && tv.tv_usec < 1024)
++		if (tv.tv_sec < t /* we are still in old second */
++		 || (tv.tv_sec == t && tv.tv_usec < adj) /* not too far into next second */
+ 		) {
+-			/* We are not too far into next second. Good. */
+-			break;
+-		}
+-		adj += 32; /* 2^(10-5) = 2^5 = 32 iterations max */
+-		if (adj >= 1024) {
+-			/* Give up trying to sync */
+-			break;
++			break; /* good, we are in sync! */
+ 		}
+ 
+-		/* Try to sync up by sleeping */
+ 		rem_usec = 1000000 - tv.tv_usec;
+-		if (rem_usec < 1024) {
+-			goto small_rem; /* already close, don't sleep */
++		if (rem_usec < adj) {
++			t = tv.tv_sec;
++			goto small_rem; /* already close to next sec, don't sleep */
+ 		}
+-		/* Need to sleep.
+-		 * Note that small adj on slow processors can make us
+-		 * to always overshoot tv.tv_usec < 1024 check on next
+-		 * iteration. That's why adj is increased on each iteration.
+-		 * This also allows it to be reused as a loop limiter.
+-		 */
+-		usleep(rem_usec - adj);
+-	}
+ 
+-	xioctl(rtc, RTC_SET_TIME, &tm_time);
++		/* Try to sync up by sleeping */
++		usleep(rem_usec - adj);
+ 
+-	/* Debug aid to find "good" TWEAK_USEC.
++		/* Jump to 1ms diff, then increase fast (x2): EVERY loop
++		 * takes ~1 sec, people won't like slowly converging code here!
++		 */
++	//bb_error_msg("adj:%d tv.tv_usec:%d", adj, (int)tv.tv_usec);
++		if (adj < 512)
++			adj = 512;
++		/* ... and if last "overshoot" does not look insanely big,
++		 * just use it as adj increment. This makes convergence faster.
++		 */
++		if (tv.tv_usec < adj * 8) {
++			adj += tv.tv_usec;
++			continue;
++		}
++		adj *= 2;
++	}
++	/* Debug aid to find "optimal" TWEAK_USEC with nearly exact sync.
+ 	 * Look for a value which makes tv_usec close to 999999 or 0.
+-	 * for 2.20GHz Intel Core 2: TWEAK_USEC ~= 200
++	 * For 2.20GHz Intel Core 2: optimal TWEAK_USEC ~= 200
+ 	 */
+-	//bb_error_msg("tv.tv_usec:%d adj:%d", (int)tv.tv_usec, adj);
++	//bb_error_msg("tv.tv_usec:%d", (int)tv.tv_usec);
++#endif
++
++	tm_time.tm_isdst = 0;
++	xioctl(rtc, RTC_SET_TIME, &tm_time);
+ 
+ 	if (ENABLE_FEATURE_CLEAN_UP)
+ 		close(rtc);

package/busybox/busybox-1.16.1-sed.patch

@@ -0,0 +1,47 @@
+diff -urpN busybox-1.16.1/editors/sed.c busybox-1.16.1-sed/editors/sed.c
+--- busybox-1.16.1/editors/sed.c	2010-03-28 13:43:35.000000000 -0400
++++ busybox-1.16.1-sed/editors/sed.c	2010-04-20 13:33:26.301975462 -0400
+@@ -936,7 +936,15 @@ static void process_files(void)
+ 		/* Skip blocks of commands we didn't match */
+ 		if (sed_cmd->cmd == '{') {
+ 			if (sed_cmd->invert ? matched : !matched) {
+-				while (sed_cmd->cmd != '}') {
++				unsigned nest_cnt = 0;
++				while (1) {
++					if (sed_cmd->cmd == '{')
++						nest_cnt++;
++					if (sed_cmd->cmd == '}') {
++						nest_cnt--;
++						if (nest_cnt == 0)
++							break;
++					}
+ 					sed_cmd = sed_cmd->next;
+ 					if (!sed_cmd)
+ 						bb_error_msg_and_die("unterminated {");
+@@ -1031,7 +1039,7 @@ static void process_files(void)
+ 		case 'c':
+ 			/* Only triggers on last line of a matching range. */
+ 			if (!sed_cmd->in_match)
+-				sed_puts(sed_cmd->string, NO_EOL_CHAR);
++				sed_puts(sed_cmd->string, '\n');
+ 			goto discard_line;
+ 
+ 		/* Read file, append contents to output */
+diff -urpN busybox-1.16.1/testsuite/sed.tests busybox-1.16.1-sed/testsuite/sed.tests
+--- busybox-1.16.1/testsuite/sed.tests	2010-03-19 22:58:07.000000000 -0400
++++ busybox-1.16.1-sed/testsuite/sed.tests	2010-04-20 13:33:26.301975462 -0400
+@@ -248,4 +248,14 @@ testing "sed beginning (^) matches only 
+ 	">/usr</>lib<\n" "" \
+ 	"/usr/lib\n"
+ 
++testing "sed c" \
++	"sed 'crepl'" \
++	"repl\nrepl\n" "" \
++	"first\nsecond\n"
++
++testing "sed nested {}s" \
++	"sed '/asd/ { p; /s/ { s/s/c/ }; p; q }'" \
++	"qwe\nasd\nacd\nacd\n" "" \
++	"qwe\nasd\nzxc\n"
++
+ exit $FAILCOUNT

package/busybox/busybox-1.16.x.config

@@ -604,10 +604,10 @@ CONFIG_DEVMEM=y
 CONFIG_EJECT=y
 # CONFIG_FEATURE_EJECT_SCSI is not set
 # CONFIG_FBSPLASH is not set
-CONFIG_FLASHCP=y
-CONFIG_FLASH_LOCK=y
-CONFIG_FLASH_UNLOCK=y
-CONFIG_FLASH_ERASEALL=y
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
 # CONFIG_IONICE is not set
 # CONFIG_INOTIFYD is not set
 CONFIG_LAST=y

package/busybox/busybox.mk

@@ -45,6 +45,8 @@ $(BUSYBOX_DIR)/.config: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
 	cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
 	$(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
 		$(BUSYBOX_DIR)/.config
+	$(SED) 's,^CONFIG_EXTRA_CFLAGS=.*,CONFIG_EXTRA_CFLAGS=\"$(BUSYBOX_CFLAGS)\",' \
+		$(BUSYBOX_DIR)/.config
 # id applet breaks on >=1.13.0 with old uclibc unless the bb pwd routines are used
 ifeq ($(BR2_BUSYBOX_VERSION_1_13_X)$(BR2_BUSYBOX_VERSION_1_14_X)$(BR2_UCLIBC_VERSION_0_9_28_3)$(BR2_UCLIBC_VERSION_0_9_29),yy)
 	if grep -q 'CONFIG_ID=y' $(BUSYBOX_DIR)/.config; \
@@ -78,6 +80,11 @@ ifeq ($(BR2_INET_RPC),y)
 else
 	$(SED) "s/^.*CONFIG_FEATURE_MOUNT_NFS.*/CONFIG_FEATURE_MOUNT_NFS=n/;" $(BUSYBOX_DIR)/.config
 endif
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+	$(SED) "s/^.*CONFIG_STATIC.*/CONFIG_STATIC=y/;" $(BUSYBOX_DIR)/.config
+else
+	$(SED) "s/^.*CONFIG_STATIC.*/CONFIG_STATIC=n/;" $(BUSYBOX_DIR)/.config
+endif
 ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y)
 	# force mdev on
 	$(SED) "s/^.*CONFIG_MDEV.*/CONFIG_MDEV=y/" $(BUSYBOX_DIR)/.config
@@ -100,23 +107,15 @@ endif
 $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
-		ARCH=$(KERNEL_ARCH) \
-		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR)
-ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
-	rm -f $@
-	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
-		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
-		ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
-		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) \
-		-f scripts/Makefile.IMA
-endif
+		EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
+		ARCH=$(KERNEL_ARCH) -C $(BUSYBOX_DIR)
 
 $(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
 ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y)
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
-		ARCH=$(KERNEL_ARCH) \
-		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) install
+		EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
+		ARCH=$(KERNEL_ARCH) -C $(BUSYBOX_DIR) install
 else
 	install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
 endif

package/busybox/initramfs.mk

@@ -1,149 +0,0 @@
-#############################################################
-#
-# busybox image for initramfs
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
-
-BUSYBOX_INITRAMFS_DIR:=$(BUSYBOX_DIR)-initramfs
-BR2_INITRAMFS_DIR:=$(BUILD_DIR)/initramfs
-BB_INITRAMFS_TARGET:=$(IMAGE).initramfs_lst
-
-$(BUSYBOX_INITRAMFS_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
-	rm -rf $(BUILD_DIR)/tmp $(BUSYBOX_INITRAMFS_DIR)
-	mkdir -p $(BUILD_DIR)/tmp
-	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR)/tmp $(TAR_OPTIONS) -
-ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
-	mv $(BUILD_DIR)/tmp/busybox $(BUSYBOX_INITRAMFS_DIR)
-else
-	mv $(BUILD_DIR)/tmp/busybox-$(BUSYBOX_VERSION) $(BUSYBOX_INITRAMFS_DIR)
-endif
-	touch $@
-
-$(BUSYBOX_INITRAMFS_DIR)/.config $(BUSYBOX_INITRAMFS_DIR)/.configured: $(BUSYBOX_INITRAMFS_DIR)/.unpacked
-	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
-		CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_INITRAMFS_DIR) \
-		allnoconfig
-	mv $(BUSYBOX_INITRAMFS_DIR)/.config $(BUSYBOX_INITRAMFS_DIR)/.config.no
-	(echo CONFIG_PREFIX=\"$(BR2_INITRAMFS_DIR)\"; \
-	 echo CONFIG_NITPICK=y; \
-	 echo CONFIG_FEATURE_BUFFERS_USE_MALLOC=y; \
-	 echo CONFIG_INCLUDE_SUSv2=n; \
-	 echo CONFIG_CAT=y; \
-	 echo CONFIG_CHROOT=y; \
-	 echo CONFIG_DD=y; \
-	 echo CONFIG_FEATURE_DD_IBS_OBS=y; \
-	 echo CONFIG_FALSE=y; \
-	 echo CONFIG_GUNZIP=y; \
-	 echo CONFIG_HALT=y; \
-	 echo CONFIG_INIT=y; \
-	 echo CONFIG_INSMOD=y; \
-	 echo CONFIG_KILL=y; \
-	 echo CONFIG_LN=y; \
-	 echo CONFIG_MDEV=y; \
-	 echo CONFIG_MKDIR=y; \
-	 echo CONFIG_MKFIFO=y; \
-	 echo CONFIG_MKNOD=y; \
-	 echo CONFIG_MODPROBE=y; \
-	 echo CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y; \
-	 echo CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y; \
-	 echo CONFIG_FEATURE_CHECK_TAINTED_MODULE=n; \
-	 echo CONFIG_FEATURE_2_4_MODULES=n; \
-	 echo CONFIG_MOUNT=y; \
-	 echo CONFIG_MSH=y; \
-	 echo CONFIG_FEATURE_SH_IS_MSH=y; \
-	 echo CONFIG_PS=y; \
-	 echo CONFIG_READLINK=y; \
-	 echo CONFIG_RMMOD=y; \
-	 echo CONFIG_STATIC=y; \
-	 echo CONFIG_SWITCH_ROOT=y; \
-	 echo CONFIG_SYNC=y; \
-	 echo CONFIG_TFTP=y; \
-	 echo CONFIG_FEATURE_TFTP_GET=y; \
-	 echo CONFIG_FEATURE_TFTP_PUT=y; \
-	 echo CONFIG_TRUE=y; \
-	 echo CONFIG_UMOUNT=y; \
-	 echo CONFIG_FEATURE_UMOUNT_ALL=y; \
-	 echo CONFIG_UNAME=y; \
-	) > $(BUSYBOX_INITRAMFS_DIR)/.config
-	cp -f $(BUSYBOX_INITRAMFS_DIR)/.config \
-		$(BUSYBOX_INITRAMFS_DIR)/.config.prune
-	$(SED) 's|\([^=]*\)=.*|/\1[^_]*/d|g' \
-		$(BUSYBOX_INITRAMFS_DIR)/.config.prune
-	$(SED) '' -f $(BUSYBOX_INITRAMFS_DIR)/.config.prune \
-		$(BUSYBOX_INITRAMFS_DIR)/.config.no
-	cat $(BUSYBOX_INITRAMFS_DIR)/.config.no >> \
-		$(BUSYBOX_INITRAMFS_DIR)/.config
-	yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
-		CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_INITRAMFS_DIR) \
-		oldconfig
-	touch $@
-
-
-$(BUSYBOX_INITRAMFS_DIR)/busybox: $(BUSYBOX_INITRAMFS_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
-		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
-		ARCH=$(KERNEL_ARCH) \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
-		busybox.links busybox
-ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
-	rm -f $@
-	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
-		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
-		ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
-		-f scripts/Makefile.IMA
-endif
-
-$(BR2_INITRAMFS_DIR)/bin/busybox: $(BUSYBOX_INITRAMFS_DIR)/busybox
-	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
-		CROSS="$(TARGET_CROSS)" \
-		ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
-		install
-	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
-
-
-$(BB_INITRAMFS_TARGET): host-fakeroot $(BR2_INITRAMFS_DIR)/bin/busybox
-	ln -fs bin/busybox $(BUILD_DIR)/initramfs/init
-	mkdir -p $(BUILD_DIR)/initramfs/etc
-	cat target/generic/target_busybox_skeleton/etc/inittab > \
-		$(BUILD_DIR)/initramfs/etc/inittab
-	rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	(echo "chown -R 0:0 $(BUILD_DIR)/initramfs"; \
-	 echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(BUILD_DIR)/initramfs"; \
-	 echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(BUILD_DIR)/initramfs > $(BB_INITRAMFS_TARGET)"; \
-	) > $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	chmod +x $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	$(HOST_DIR)/usr/bin/fakeroot -- \
-		$(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	touch -c $@
-
-$(BUILD_DIR)/.initramfs_done: $(BR2_INITRAMFS_DIR)/bin/busybox \
-					$(BB_INITRAMFS_TARGET)
-	touch $@
-
-busybox-initramfs-source:
-busybox-initramfs: $(BUILD_DIR)/.initramfs_done
-
-busybox-initramfs-menuconfig: host-sed $(BUILD_DIR) busybox-source $(BUSYBOX_INITRAMFS_DIR)/.configured
-	$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_INITRAMFS_DIR) menuconfig
-
-busybox-initramfs-clean:
-	rm -f $(BUSYBOX_INITRAMFS_DIR)/busybox $(BUILD_DIR)/.initramfs_*
-	rm -rf $(BR2_INITRAMFS_DIR) $(BB_INITRAMFS_TARGET)
-	-$(MAKE) -C $(BUSYBOX_INITRAMFS_DIR) clean
-
-busybox-initramfs-dirclean:
-	rm -rf $(BUSYBOX_INITRAMFS_DIR) $(BR2_INITRAMFS_DIR) \
-		$(BUILD_DIR)/.initramfs_*
-endif
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
-TARGETS+=busybox-initramfs
-endif

package/bzip2/bzip2.mk

@@ -3,68 +3,59 @@
 # bzip2
 #
 #############################################################
-BZIP2_VERSION:=1.0.4
+BZIP2_VERSION:=1.0.5
+BZIP2_SONAME=1.0.4
 BZIP2_SOURCE:=bzip2-$(BZIP2_VERSION).tar.gz
 BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VERSION)
-BZIP2_DIR:=$(BUILD_DIR)/bzip2-$(BZIP2_VERSION)
-BZIP2_CAT:=$(ZCAT)
-BZIP2_BINARY:=$(BZIP2_DIR)/bzip2
-BZIP2_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/bzmore
+BZIP2_INSTALL_STAGING=YES
 
-$(DL_DIR)/$(BZIP2_SOURCE):
-	 $(call DOWNLOAD,$(BZIP2_SITE),$(BZIP2_SOURCE))
+define BZIP2_FIX_MAKEFILE
+	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile
+	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_SONAME) \
+	    libbz2.so,g" $(@D)/Makefile-libbz2_so
+	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile
+	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile-libbz2_so
+endef
 
-bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE)
+BZIP2_POST_PATCH_HOOKS += BZIP2_FIX_MAKEFILE
+
+define BZIP2_NOLARGEFILE_FIX_MAKEFILE
+	$(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile
+	$(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile-libbz2_so
+endef
 
-$(BZIP2_DIR)/.unpacked: $(DL_DIR)/$(BZIP2_SOURCE)
-	$(BZIP2_CAT) $(DL_DIR)/$(BZIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(BZIP2_DIR)/Makefile
-	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \
-	    libbz2.so,g" $(BZIP2_DIR)/Makefile-libbz2_so
 ifneq ($(BR2_LARGEFILE),y)
-	$(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile
-	$(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile-libbz2_so
+BZIP2_POST_PATCH_HOOKS += BZIP2_NOLARGEFILE_FIX_MAKEFILE
 endif
-	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile
-	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so
-	touch $@
 
-$(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
-	$(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \
-		-C $(BZIP2_DIR) -f Makefile-libbz2_so
-	$(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \
-		-C $(BZIP2_DIR) libbz2.a
-	cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/
-	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
-	cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
+define BZIP2_BUILD_CMDS
+	$(TARGET_MAKE_ENV) \
+	$(MAKE) -C $(@D) -f Makefile-libbz2_so \
+	CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)"
+	$(TARGET_MAKE_ENV) \
+	$(MAKE) -C $(@D) \
+	CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)" \
+	libbz2.a bzip2 bzip2recover
+endef
+
+define BZIP2_INSTALL_STAGING_CMDS
+	cp $(@D)/bzlib.h $(STAGING_DIR)/usr/include/
+	cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(STAGING_DIR)/usr/lib/
+	cp $(@D)/libbz2.a $(STAGING_DIR)/usr/lib/
 	(cd $(STAGING_DIR)/usr/lib/; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
-	)
-	(cd $(STAGING_DIR)/usr/lib; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \
+		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so; \
+		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1.0; \
+		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1; \
 	)
+endef
 
-$(BZIP2_BINARY): $(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION)
-	$(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) bzip2 bzip2recover
-	touch -c $@
-
-$(BZIP2_TARGET_BINARY): $(BZIP2_BINARY)
-	(cd $(TARGET_DIR)/usr/bin; \
-		rm -f bzip2 bunzip2 bzcat bzip2recover \
-			bzgrep bzegrep bzfgrep bzmore bzless bzdiff bzcmp; \
-	)
-	$(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(BZIP2_DIR) install
-	rm -f $(TARGET_DIR)/usr/lib/libbz2.a
-	rm -f $(TARGET_DIR)/usr/include/bzlib.h
-	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/
+define BZIP2_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
+	$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install
+	cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(TARGET_DIR)/usr/lib/
 	(cd $(TARGET_DIR)/usr/lib; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
+		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1.0; \
+		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so; \
 	)
 	(cd $(TARGET_DIR)/usr/bin; \
 		ln -snf bzip2 bunzip2; \
@@ -74,47 +65,37 @@ $(BZIP2_TARGET_BINARY): $(BZIP2_BINARY)
 		ln -snf bzgrep bzegrep; \
 		ln -snf bzgrep bzfgrep; \
 	)
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/man
-endif
-	rm -rf $(TARGET_DIR)/share/locale
-	rm -rf $(TARGET_DIR)/usr/share/doc
+endef
 
-$(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/usr/lib/libbz2.a
-	mkdir -p $(TARGET_DIR)/usr/include
-	cp $(STAGING_DIR)/usr/include/bzlib.h $(TARGET_DIR)/usr/include/
-	cp $(STAGING_DIR)/usr/lib/libbz2.a $(TARGET_DIR)/usr/lib/
-	rm -f $(TARGET_DIR)/lib/libbz2.so
-	(cd $(TARGET_DIR)/usr/lib; \
-		ln -fs /usr/lib/libbz2.so.1.0 libbz2.so; \
-	)
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libbz2.so.1.0
-	touch -c $@
-
-bzip2-headers: $(TARGET_DIR)/usr/lib/libbz2.a
-
-bzip2: $(BZIP2_TARGET_BINARY)
-
-bzip2-clean:
+define BZIP2_CLEAN_CMDS
 	rm -f $(addprefix $(TARGET_DIR),/lib/libbz2.* \
 					/usr/lib/libbz2.* \
 					/usr/include/bzlib.h)
 	rm -f $(addprefix $(STAGING_DIR),/lib/libbz2.* \
 					/usr/lib/libbz2.* \
 					/usr/include/bzlib.h)
-	-$(MAKE) -C $(BZIP2_DIR) clean
+	-$(MAKE) -C $(@D) clean
+endef
 
-bzip2-dirclean:
-	rm -rf $(BZIP2_DIR)
+define HOST_BZIP2_FIX_MAKEFILE
+	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile
+	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_SONAME) \
+	    libbz2.so,g" $(@D)/Makefile-libbz2_so
+	$(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile
+	$(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile-libbz2_so
+endef
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_BZIP2),y)
-TARGETS+=bzip2
-endif
+HOST_BZIP2_POST_PATCH_HOOKS += HOST_BZIP2_FIX_MAKEFILE
+
+define HOST_BZIP2_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) -f Makefile-libbz2_so
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover
+endef
+
+define HOST_BZIP2_INSTALL_CMDS
+	$(HOST_MAKE_ENV) \
+	$(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install
+endef
+
+$(eval $(call GENTARGETS,package,bzip2))
+$(eval $(call GENTARGETS,package,bzip2,host))

package/cairo/old_patches/0001-Add-autoconf-macro-AX_C_FLOAT_WORDS_BIGENDIAN.patch

@@ -1,103 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Dan Amelang <dan@amelang.net>
-Date: Sun Oct 29 21:30:08 2006 -0800
-Subject: [PATCH] Add autoconf macro AX_C_FLOAT_WORDS_BIGENDIAN
-
-The symbol that this macro defines (FLOAT_WORDS_BIGENDIAN) can be used
-to make double arithmetic tricks portable.
-
----
-
- acinclude.m4 |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.in |    1 +
- 2 files changed, 66 insertions(+), 0 deletions(-)
-
-3231d91b59a6c2e1c40bbaa8b143694b6c693662
-diff --git a/acinclude.m4 b/acinclude.m4
-index af73800..a0eb13a 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -51,3 +51,68 @@ ifelse([$1],[],,
-   AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-   AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
- ])
-+
-+# AX_C_FLOAT_WORDS_BIGENDIAN ([ACTION-IF-TRUE], [ACTION-IF-FALSE],
-+#                             [ACTION-IF-UNKNOWN])
-+#
-+# Checks the ordering of words within a multi-word float. This check
-+# is necessary because on some systems (e.g. certain ARM systems), the
-+# float word ordering can be different from the byte ordering. In a
-+# multi-word float context, "big-endian" implies that the word containing
-+# the sign bit is found in the memory location with the lowest address.
-+# This implemenation was inspired by the AC_C_BIGENDIAN macro in autoconf.
-+# -------------------------------------------------------------------------
-+AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN],
-+  [AC_CACHE_CHECK(whether float word ordering is bigendian,
-+                  ax_cv_c_float_words_bigendian, [
-+
-+# The endianess is detected by first compiling C code that contains a special
-+# double float value, then grepping the resulting object file for certain
-+# strings of ascii values. The double is specially crafted to have a
-+# binary representation that corresponds with a simple string. In this
-+# implementation, the string "noonsees" was selected because the individual
-+# word values ("noon" and "sees") are palindromes, thus making this test
-+# byte-order agnostic. If grep finds the string "noonsees" in the object
-+# file, the target platform stores float words in big-endian order. If grep
-+# finds "seesnoon", float words are in little-endian order. If neither value
-+# is found, the user is instructed to specify the ordering.
-+
-+ax_cv_c_float_words_bigendian=unknown
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-+
-+double d = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0;
-+
-+]])], [
-+
-+if grep noonsees conftest.$ac_objext >/dev/null ; then
-+  ax_cv_c_float_words_bigendian=yes
-+fi
-+if grep seesnoon conftest.$ac_objext >/dev/null ; then
-+  if test "$ax_cv_c_float_words_bigendian" = unknown; then
-+    ax_cv_c_float_words_bigendian=no
-+  else
-+    ax_cv_c_float_words_bigendian=unknown
-+  fi
-+fi
-+
-+])])
-+
-+case $ax_cv_c_float_words_bigendian in
-+  yes)
-+    m4_default([$1],
-+      [AC_DEFINE([FLOAT_WORDS_BIGENDIAN], 1,
-+                 [Define to 1 if your system stores words within floats
-+                  with the most significant word first])]) ;;
-+  no)
-+    $2 ;;
-+  *)
-+    m4_default([$3],
-+      [AC_MSG_ERROR([
-+
-+Unknown float word ordering. You need to manually preset
-+ax_cv_c_float_words_bigendian=no (or yes) according to your system.
-+
-+    ])]) ;;
-+esac
-+
-+])# AX_C_FLOAT_WORDS_BIGENDIAN
-diff --git a/configure.in b/configure.in
-index 2d2bf9f..797c7ce 100644
---- a/configure.in
-+++ b/configure.in
-@@ -55,6 +55,7 @@ AC_PROG_CPP
- AC_PROG_LIBTOOL dnl required version (1.4) DON'T REMOVE!
- AC_STDC_HEADERS
- AC_C_BIGENDIAN
-+AX_C_FLOAT_WORDS_BIGENDIAN
- 
- dnl ===========================================================================
- dnl === Local macros
--- 
-1.2.6
-

package/cairo/old_patches/0002-Change-_cairo_fixed_from_double-to-use-the-magic-number-technique.patch

@@ -1,79 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Dan Amelang <dan@amelang.net>
-Date: Sun Oct 29 21:31:23 2006 -0800
-Subject: [PATCH] Change _cairo_fixed_from_double to use the "magic number" technique
-
-See long thread here:
-http://lists.freedesktop.org/archives/cairo/2006-October/008285.html 
-
----
-
- src/cairo-fixed.c |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 47 insertions(+), 1 deletions(-)
-
-d88acddcabe770e17664b34a2d5f74d3926e1642
-diff --git a/src/cairo-fixed.c b/src/cairo-fixed.c
-index 604c9e7..fe6c2dc 100644
---- a/src/cairo-fixed.c
-+++ b/src/cairo-fixed.c
-@@ -42,10 +42,56 @@ _cairo_fixed_from_int (int i)
-     return i << 16;
- }
- 
-+/* This is the "magic number" approach to converting a double into fixed
-+ * point as described here:
-+ *
-+ * http://www.stereopsis.com/sree/fpu2006.html (an overview)
-+ * http://www.d6.com/users/checker/pdfs/gdmfp.pdf (in detail)
-+ *
-+ * The basic idea is to add a large enough number to the double that the
-+ * literal floating point is moved up to the extent that it forces the
-+ * double's value to be shifted down to the bottom of the mantissa (to make
-+ * room for the large number being added in). Since the mantissa is, at a
-+ * given moment in time, a fixed point integer itself, one can convert a
-+ * float to various fixed point representations by moving around the point
-+ * of a floating point number through arithmetic operations. This behavior
-+ * is reliable on most modern platforms as it is mandated by the IEEE-754
-+ * standard for floating point arithmetic.
-+ *
-+ * For our purposes, a "magic number" must be carefully selected that is
-+ * both large enough to produce the desired point-shifting effect, and also
-+ * has no lower bits in its representation that would interfere with our
-+ * value at the bottom of the mantissa. The magic number is calculated as
-+ * follows:
-+ *
-+ *          (2 ^ (MANTISSA_SIZE - FRACTIONAL_SIZE)) * 1.5
-+ *
-+ * where in our case:
-+ *  - MANTISSA_SIZE for 64-bit doubles is 52
-+ *  - FRACTIONAL_SIZE for 16.16 fixed point is 16
-+ *
-+ * Although this approach provides a very large speedup of this function
-+ * on a wide-array of systems, it does come with two caveats:
-+ *
-+ * 1) It uses banker's rounding as opposed to arithmetic rounding.
-+ * 2) It doesn't function properly if the FPU is in single-precision
-+ *    mode.
-+ */
-+#define CAIRO_MAGIC_NUMBER_FIXED_16_16 (103079215104.0)
- cairo_fixed_t
- _cairo_fixed_from_double (double d)
- {
--    return (cairo_fixed_t) floor (d * 65536 + 0.5);
-+    union {
-+        double d;
-+        int32_t i[2];
-+    } u;
-+
-+    u.d = d + CAIRO_MAGIC_NUMBER_FIXED_16_16;
-+#ifdef FLOAT_WORDS_BIGENDIAN
-+    return u.i[1];
-+#else
-+    return u.i[0];
-+#endif
- }
- 
- cairo_fixed_t
--- 
-1.2.6
-

package/cdrkit/Config.in

@@ -0,0 +1,11 @@
+config BR2_PACKAGE_CDRKIT
+       # Needed for libbz
+       select BR2_PACKAGE_BZIP2
+       select BR2_PACKAGE_LIBCAP
+       bool "cdrkit"
+       help
+         cdrkit is a suite of programs for recording CDs and DVDs,
+         blanking CD-RW media, creating ISO-9660 filesystem images,
+         extracting audio CD data, and more.
+
+	 http://www.cdrkit.org/

package/cdrkit/cdrkit.mk

@@ -0,0 +1,63 @@
+CDRKIT_VERSION=1.1.10
+CDRKIT_SOURCE=cdrkit-$(CDRKIT_VERSION).tar.gz
+CDRKIT_SITE=http://www.cdrkit.org/releases/
+
+CDRKIT_DEPENDENCIES=libcap bzip2 host-cmake
+HOST_CDRKIT_DEPENDENCIES=host-libcap host-cmake host-bzip2
+
+ifeq ($(BR2_ENDIAN),"BIG")
+CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=1
+else
+CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=0
+endif
+
+define CDRKIT_CONFIGURE_CMDS
+ -mkdir $(@D)/build
+ (cd $(@D)/build ; \
+	$(HOST_DIR)/usr/bin/cmake .. \
+		-Wno-dev \
+		-DCMAKE_SYSTEM_NAME:STRING="Linux" \
+		-DCMAKE_C_COMPILER:FILEPATH="$(TARGET_CC)" \
+		-DCMAKE_CXX_COMPILER:FILEPATH="$(TARGET_CXX)" \
+		-DCMAKE_C_FLAGS:STRING="$(TARGET_CFLAGS)" \
+		-DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+		-DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+		-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+		-DCMAKE_FIND_ROOT_PATH:PATH="$(STAGING_DIR)" \
+		-DCMAKE_INSTALL_PREFIX:PATH="$(TARGET_DIR)/usr" \
+		$(CMAKE_ENDIAN_OPT) \
+ )
+endef
+
+define CDRKIT_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build
+endef
+
+define CDRKIT_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build install
+endef
+
+define HOST_CDRKIT_CONFIGURE_CMDS
+ -mkdir $(@D)/build
+ (cd $(@D)/build ; \
+	$(HOST_DIR)/usr/bin/cmake .. \
+		-Wno-dev \
+		-DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \
+		-DCMAKE_EXE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
+		-DCMAKE_MODULE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
+		-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
+		-DCMAKE_INSTALL_PREFIX:STRING="$(HOST_DIR)/usr" \
+ )
+endef
+
+define HOST_CDRKIT_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build
+endef
+
+define HOST_CDRKIT_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build  install
+endef
+
+$(eval $(call GENTARGETS,package,cdrkit))
+$(eval $(call GENTARGETS,package,cdrkit,host))
+

package/cloop/cloop.mk

@@ -0,0 +1,18 @@
+CLOOP_VERSION=2.631-1
+CLOOP_SOURCE=cloop_$(CLOOP_VERSION).tar.gz
+CLOOP_SITE=http://debian-knoppix.alioth.debian.org/sources/
+
+HOST_CLOOP_DEPENDENCIES = host-zlib
+
+define HOST_CLOOP_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE1) \
+   CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DUSE_ERROR_SILENT" -C $(@D) APPSONLY=yes
+endef
+
+define HOST_CLOOP_INSTALL_CMDS
+ install -m 755 $(@D)/create_compressed_fs $(HOST_DIR)/usr/bin
+ install -m 755 $(@D)/extract_compressed_fs $(HOST_DIR)/usr/bin
+endef
+
+$(eval $(call GENTARGETS,package,cloop))
+$(eval $(call GENTARGETS,package,cloop,host))

package/cmake/cmake.mk

@@ -0,0 +1,20 @@
+CMAKE_VERSION=2.8.0
+CMAKE_SOURCE=cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_SITE=http://www.cmake.org/files/v2.8/
+
+define HOST_CMAKE_CONFIGURE_CMDS
+ (cd $(@D); \
+   ./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(BR2_JLEVEL) \
+ )
+endef
+
+define HOST_CMAKE_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_CMAKE_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+$(eval $(call GENTARGETS,package,cmake))
+$(eval $(call GENTARGETS,package,cmake,host))