update for 2010.02-rc1

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Makefile: release: use git archive
2026-01-08 02:09:48 +03:00 · 2010-02-09 16:54:30 +01:00 · 2010-02-09 16:34:04 +01:00 · 2010-02-09 16:23:52 +01:00 · 2010-02-09 12:21:37 +01:00 · 2010-02-09 12:09:16 +01:00
808 changed files with 10181 additions and 276464 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
-/build_*
-/project_*
-/toolchain_*
-/binaries
+/output
 /dl
 /.auto.deps
 /.config.cmd
--- a/197
+++ b/197
@@ -1,3 +1,200 @@
+2010.02-rc1, Released February 9th, 2010:
+
+	Fixes all over the tree and new features.
+
+	Generalized autotools infrastructure to be usable for
+	non-autotools packages, see package/Makefile.package.in for
+	details.
+
+	Cleaned up avr32 toolchain config, external source-based
+	toolchain support is gone.
+
+	Dependency checks: Also check for makeinfo, only print output
+	on errors.
+
+	Toolchain: uClibc 0.9.30.2, gcc 4.4.3
+
+	New packages: libcdaudio, libdvdnav, libdvdread, hostapd, ser2net,
+	tcpreplay
+
+	Updated/fixed packages: alsa-lib, alsa-utils, at, autoconf, bash,
+	bind, binutils, bootutils, busybox, dbus, directfb, dnsmasq,
+	e2fsprogs, gstreamer, gperf, gst-plugins-bad, gvfs, fbdump, flex,
+	hal, iptables, iw, jpeg, kismet, libfuse, libglib2, liboil, libpcap,
+	libungif, libxml2, libxslt, lighttpd, mesa, mpg123, mtd-utils, nbd,
+	neon, netstat-nat, newt, openvpn, pcre, php, qt, rdesktop, readline,
+	rpm, sawman, sdl, sdl_ttf, sqlite, sshfs, tremor, u-boot,
+	usb_modeswitch, usbutils, webkit, wpa_supplicant, xfsprogs, zlib
+
+	Removed package: asterisk, openswan
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#515: tcpreplay: new package
+	#553: Wrong DirectFB ps2mouse limitation
+	#559: mesa3d build fails
+	#679: Autoconf cannot find M4
+	#739: New/updated hostapd package
+	#749: Bump usbutils package to version 0.86
+	#751: Kernel 2.6 snapshot fetch fail
+	#753: Bump lighttpd package to 1.4.25
+	#757: U-Boot: mkimage cannot be installed using external toolchain
+	#761: Add binutils 2.20 to toolchain options
+	#763: [SECURITY] Update pcre to 7.9
+	#765: Add buildroot branding to gcc
+	#767: Bump iw package to 0.9.18
+	#773: [SECURITY] Update bind to 9.5.2-P1
+	#795: Minor edits to fix typos, grammar, spelling, usage in documen...
+	#813: Drop not very useful generic package selection options ...
+	#823: Editor backup files (~) is copied from the target_skeleton
+	#827: Bump mtd-utils package to version 1.2.0
+	#841: Build error
+	#913: Bump iptables to 1.4.6
+	#919: Bump usb_modeswitch package to 1.0.7
+	#925: Bump wpa_supplicant package to 0.6.10
+	#931: Bump kismet package to 2010-01-R1
+	#937: Bump openvpn package to 2.1.1
+	#943: Bump sqlite package to 3.6.22
+	#961: Bump dnsmasq to 2.52
+	#967: Bump netstat-nat to 1.4.10
+	#973: Bump iw to 0.9.19
+	#1003: DHCP options disabled with busybox-1.16.0
+	#1009: [SECURITY] Bump php to 5.2.12
+	#1015: [SECURITY] Bump bind to 9.5.1-P2
+	#1027: Busybox flash commands conflict with those from mtd-utils
+	#1063: [SECURITY] Update lighttpd to 1.4.26
+
+2009.11, Released December 1st, 2009:
+
+	Additional fixes and cleanups.
+
+	Updated/fixed packages: alsamixergui, autoconf, coreutils, fltk,
+	microperl, ncurses, vim
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#707: Cant configure fltk-1.1.7. configure: error: Configure could ...
+
+2009.11-rc2, Released November 29th, 2009:
+
+	Additional fixes and cleanups.
+
+	Updated/fixed packages: busybox, dbus, fltk, gvfs, ltrace
+
+2009.11-rc1, Released November 23rd, 2009:
+
+	Fixes all over the tree and new features.
+
+	Cleaned up / Simplified build directory layout. Refer to
+	docs/buildroot.html#using for details.
+
+	Target defconfig files moved to configs/ and listed in 'make help'
+	output.
+
+	Fixed *clean targets. Now clean removes everything generated,
+	so you can do a fresh rebuild. Distclean furthermore removes
+	kbuild tools and .config, bringing the source tree back in a
+	pristine state.
+
+	Toolchain: ARM cortex A8 support, GCC 4.4.2, sensible default
+	soft / hardfloat setting for architecture, ensure target-ldd
+	gets installed.
+
+	New packages: divine, gvfs, libarchive, libmicrohttpd,
+	sdl_sound, swfdec, sysstat
+
+	Updated/fixed packages: alsa-lib, alsamixergui, autoconf, bootutils,
+	busybox, gcc, directfb, dnsmasq, e2fsprogs, festival, gamin, gperf,
+	gqview, gstreamer, gst-plugins-bad, gst-plugins-base, gst-plugins-good,
+	imagemagick, ipkg, iptables, iw, kernel-headers, kismet, leafpad,
+	libelf, libevent, libglib2, libidn, liblockfile, libmad, libpcap,
+	libupnp, libuuid, libxml2, lighttpd, ltrace, lua, lzma, magiccube4d,
+	matchbox, mdadm, nbd, ncftp, ncurses, netkittelnet, netsnmp,
+	ng-spice-rework, ntfs-3g, openntp, openssl, pcmanfm, php, psmisc,
+	python, quagga, radvd, rpm, rsync, rubix, samba, sawman, sdl, sdl_image,
+	shared-mime-info, sfdisk, spawn-fcgi, speech-tools, sqlite, squashfs,
+	synergy, syslinux, sysklogd, target-binutils, tcpdump, torsmo, u-boot,
+	udpcast, util-linux, valgrind, vsftpd, wipe, wpa-supplicant, x11vnc,
+	xdata_xcursor-themes, xboard, xfsprogs, xstroke, zlib[5~
+
+	Removed package: mdnsresponder, mpatrol, gcc 3.4.6 + 4.0.4, vice
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#301: allow to install libsmbclient
+	#303: add gvfs package
+	#477: Add sdl_sound package
+	#487: Make kismet package sexier
+	#511: New package usb_modeswitch
+	#527: misc fixes for dnsmasq package
+	#565: libevent: Bump version and clean up makefile
+	#587: Use iptables multipurpose binaries and bump to 1.4.4
+	#593: Missing early check for patch(1)
+	#597: (REOP)  Selecting busybox in buildroot's config clobbers ar ...
+	#609: libmicrohttpd: New package
+	#615: python: Don't delete .py files unless asked
+	#617: netkit/inetd requires RPC and fails to build if RPC is disabled
+	#619: netkittelnet requires netkitbase to install, but there's no ...
+	#645: allow to build nbd-server with NBD package
+	#653: [SECURITY] Update php package to version 5.2.11
+	#655: Update sqlite package to version 3.6.18
+	#657: Bug in imagemagick-clean target
+	#663: Add option for NAND flash with 512B Page and 16 kB erasesize ...
+	#665: [PATCH] Samba package
+	#667: [PATCH] e2fsprogs
+	#683: SDL-dfb does not select directfb
+	#701: make install problem with unstripped binaries
+	#703: [SECURITY] Update openssl package to 0.9.8l
+	#705: Bump spawn-fcgi package to 1.6.3
+	#709: Bump lighttpd package to 1.4.24
+	#713: Migrate openntpd package to Makefile.autotools.in
+	#715: Bump libidn package to 1.15 and other fixes
+	#717: Bump dnsmasq to 2.51 and introduce new IDN option
+	#731: Bump iw package to 0.9.17
+
+2009.08, Released August 31th, 2009:
+
+	Additional fixes and cleanups.
+
+	Updated/fixed packages: ctorrent, saveconfig/getconfig,
+	sdl_net, util-linux.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#529: util-linux doesn't find headers and include libs correctly
+	#557: Build ctorrent with SSL support if available
+
+2009.08-rc3, Released August 26th, 2009:
+
+	Additional fixes and cleanups.
+
+	Updated/fixed packages: alsa-utils, berkeleydb, busybox, dbus,
+	directfb, enchant, kernel headers.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#471: Allow directfb compilation with debug
+	#541: Removal of CVS directories in target filesystem broken
+	#547: berkeleydb: Update config.{sub, guess}
+	#549: enchant: Fix dependencies.
+	#569: Fix alsa-utils build for x86 on x86-64
+
+2009.08-rc2, Released August 6th, 2009:
+
+	Additional fixes and new features.
+
+	New packages: libuuid, gcc 4.3.4.
+
+	Updated/fixed packages: busybox, classpath, gzip, ipsec-tools,
+	jamvm, libusb, microperl, neon, popt, sed, webkit.
+
+	Fixed issue with 'make oldconfig'
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#525: sed broken with external toolchain
+	#537: Fix gzip build with recent glibc
+
 2009.08-rc1, Released August 2nd, 2009:

 	Fixes all over the tree and new features.
--- a/Config.in
+++ b/Config.in
@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG

 config BR2_VERSION
 	string
-	default "2009.08-git"
+	default "2010.02-rc1"

 source "target/Config.in.arch"
 source "target/device/Config.in"
@@ -27,6 +27,14 @@ config BR2_SVN_UP
 	string "Subversion (svn) command to update source tree"
 	default "svn up"

+config BR2_BZR_CO
+	string "Bazaar (bzr) command to download source tree"
+	default "bzr co"
+
+config BR2_BZR_UP
+	string "Bazaar (bzr) command to update source tree"
+	default "bzr up"
+
 config BR2_GIT
 	string "Git command to download source tree"
 	default "git clone"
@@ -61,13 +69,13 @@ config BR2_TAR_OPTIONS

 config BR2_DL_DIR
 	string "Download dir"
-	default "$(BASE_DIR)/dl"
+	default "$(TOPDIR)/dl"
 	help
 	  Directory to store all the source files that we need to fetch.
 	  If the Linux shell environment has defined the BUILDROOT_DL_DIR
 	  environment variable, then this overrides this configuration item.

-	  The default is $(BASE_DIR)/dl
+	  The default is $(TOPDIR)/dl

 config BR2_COPYTO
 	string "Copy result to..."
@@ -80,7 +88,7 @@ source	"target/device/Config.in.mirrors"

 config BR2_STAGING_DIR
 	string "Toolchain and header file location?"
-	default "$(BUILD_DIR)/staging_dir"
+	default "$(BASE_DIR)/staging"
 	help
 	  This is the location where the toolchain will be installed.  The
 	  toolchain will not work if it is moved from this location.
@@ -89,32 +97,7 @@ config BR2_STAGING_DIR
 	  will be used.

 	  Most people will leave this set to the default value of
-	  "$(BUILD_DIR)/staging_dir".
-
-config BR2_FPU_SUFFIX
-	bool "Add '_nofpu' suffix for softfloat toolchains"
-	help
-	  If the toolchain is configured to use softfloat, then
-	  the "_nofpu" suffix will be added to the toolchain build
-	  directory name and to any rootfs image name
-
-config BR2_TOPDIR_PREFIX
-	string "Custom build dir prefix"
-	default ""
-	help
-	  Add a custom string to the beginning of the build directories.
-
-	  build_ARCH -> [PREFIX]_build_ARCH
-	  toolchain_build_ARCH -> [PREFIX]_toolchain_build_ARCH
-
-config BR2_TOPDIR_SUFFIX
-	string "Custom build dir suffix"
-	default ""
-	help
-	  Add a custom string to the end of the build directories.
-
-	  build_ARCH -> build_ARCH_[SUFFIX]
-	  toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX]
+	  "$(BASE_DIR)/staging".

 config BR2_GNU_BUILD_SUFFIX
 	string "GNU build hostname suffix"
@@ -177,6 +160,7 @@ config BR2_RECENT

 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
--- a/253
+++ b/253
@@ -22,23 +22,21 @@
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
-TOPDIR=./
+# absolute path
+TOPDIR:=$(shell pwd)
 CONFIG_CONFIG_IN=Config.in
 CONFIG_DEFCONFIG=.defconfig
 CONFIG=package/config
 DATE:=$(shell date +%Y%m%d)

 noconfig_targets:=menuconfig xconfig config oldconfig randconfig \
-	defconfig allyesconfig allnoconfig release tags \
+	defconfig allyesconfig allnoconfig release \
+	randpackageconfig allyespackageconfig allnopackageconfig \
 	source-check help

-
-# Use shell variables, if defined
-ifneq ($(BUILDROOT_LOCAL),)
-BR2_LOCAL:=$(BUILDROOT_LOCAL)
-else
-BR2_LOCAL:=$(TOPDIR)/local
-endif
+# Strip quotes and then whitespaces
+qstrip=$(strip $(subst ",,$(1)))
+#"))

 # Variables for use in Make constructs
 comma:=,
@@ -48,20 +46,13 @@ space:=$(empty) $(empty)
 # $(shell find . -name *_defconfig |sed 's/.*\///')
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-ifeq ($(BOARD),)
-# if "make BOARD=xyz" command
 -include .config
-else
-# if "make" command
-include $(BR2_LOCAL)/$(BOARD)/$(BOARD).config
-endif
 endif

 # Override BR2_DL_DIR if shell variable defined
 ifneq ($(BUILDROOT_DL_DIR),)
 BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
 endif
-LOCAL:=$(BR2_LOCAL)

 # To put more focus on warnings, be less verbose as default
 # Use 'make V=1' to see the full commands
@@ -206,17 +197,77 @@ PREFERRED_LIB_FLAGS:=--enable-static --enable-shared
 # along with the packages to build for the target.
 #
 ##############################################################
-ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers
 else
 BASE_TARGETS:=uclibc
 endif
 TARGETS:=

-# setup our paths
-include project/Makefile.in
+# silent mode requested?
+QUIET:=$(if $(findstring s,$(MAKEFLAGS)),-q)

-BR2_DEPENDS_DIR=$(PROJECT_BUILD_DIR)/buildroot-config
+# Strip off the annoying quoting
+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)
+BZR_CO:=$(call qstrip,$(BR2_BZR_CO)) $(QUIET)
+BZR_UP:=$(call qstrip,$(BR2_BZR_UP)) $(QUIET)
+GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET)
+ZCAT:=$(call qstrip,$(BR2_ZCAT))
+BZCAT:=$(call qstrip,$(BR2_BZCAT))
+TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
+
+ifneq ("$(origin O)", "command line")
+O:=output
+else
+# other packages might also support Linux-style out of tree builds
+# with the O=<dir> syntax (E.G. Busybox does). As make automatically
+# forwards command line variable definitions those packages get very
+# confused. Fix this by telling make to not do so
+MAKEOVERRIDES =
+endif
+
+# bash prints the name of the directory on 'cd <dir>' if CDPATH is
+# set, so unset it here to not cause problems. Notice that the export
+# line doesn't affect the environment of $(shell ..) calls, so
+# explictly throw away any output from 'cd' here.
+export CDPATH:=
+BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd)
+$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
+
+DL_DIR=$(call qstrip,$(BR2_DL_DIR))
+ifeq ($(DL_DIR),)
+DL_DIR:=$(TOPDIR)/dl
+endif
+
+BUILD_DIR:=$(BASE_DIR)/build
+
+GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX))
+
+STAGING_DIR:=$(call qstrip,$(BR2_STAGING_DIR))
+
+# packages compiled for the host goes here
+HOST_DIR:=$(BASE_DIR)/host
+
+# stamp (dependency) files go here
+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))
+
+BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config

 include toolchain/Makefile.in
 include package/Makefile.in
@@ -233,12 +284,10 @@ all: world
 # In this section, we need .config
 include .config.cmd

-include project/*.mk
-
 # We also need the various per-package makefiles, which also add
 # each selected package to TARGETS if that package was selected
 # in the .config file.
-ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 # avoid pulling in external toolchain which is broken for toplvl parallel builds
 # Explicit ordering:
 include toolchain/dependencies/dependencies.mk
@@ -285,21 +334,19 @@ $(BR2_DEPENDS_DIR): .config
 	mkdir -p $(@D)
 	cp -dpRf $(CONFIG)/buildroot-config $@

-dirs: $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \
-	$(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
+dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
+	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)

 $(BASE_TARGETS): dirs

-world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL)
+world: dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)


-.PHONY: all world dirs clean dirclean distclean source \
+.PHONY: all world dirs clean distclean source \
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
-	$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \
-	$(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
+	$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
+	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)

 #############################################################
 #
@@ -307,8 +354,7 @@ world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL)
 # dependencies anywhere else
 #
 #############################################################
-$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(HOST_DIR) $(PROJECT_BUILD_DIR) \
-	$(PROJECT_BUILD_DIR)/autotools-stamps $(BINARIES_DIR) $(STAMP_DIR):
+$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR):
 	@mkdir -p $@

 $(STAGING_DIR):
@@ -326,7 +372,7 @@ endif
 endif
 	@mkdir -p $(STAGING_DIR)/usr/include

-$(PROJECT_BUILD_DIR)/.root:
+$(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
 	if ! [ -d "$(TARGET_DIR)/bin" ]; then \
 		if [ -d "$(TARGET_SKELETON)" ]; then \
@@ -337,14 +383,14 @@ $(PROJECT_BUILD_DIR)/.root:
 		fi; \
 		touch $(STAGING_DIR)/.fakeroot.00000; \
 	fi
-	-find $(TARGET_DIR) -type d -name CVS -o -name .svn -print0 | xargs -0 rm -rf
-	-find $(TARGET_DIR) -type f -name .empty -print0 | xargs -0 rm -rf
+	-find $(TARGET_DIR) -type d -name CVS -print0 -o -name .svn -print0 | xargs -0 rm -rf
+	-find $(TARGET_DIR) -type f \( -name .empty -o -name '*~' \) -print0 | xargs -0 rm -rf
 	touch $@

-$(TARGET_DIR): $(PROJECT_BUILD_DIR)/.root
+$(TARGET_DIR): $(BUILD_DIR)/.root

 erase-fakeroots:
-	rm -f $(PROJECT_BUILD_DIR)/.fakeroot*
+	rm -f $(BUILD_DIR)/.fakeroot*

 target-finalize:
 ifeq ($(BR2_HAVE_DEVFILES),y)
@@ -363,14 +409,17 @@ endif
 	find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
 	$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null

+	mkdir -p $(TARGET_DIR)/etc
+	echo $(BR2_VERSION)$(shell $(TOPDIR)/scripts/setlocalversion) > \
+		$(TARGET_DIR)/etc/br-version
+
 ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
 	$(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR)
 endif

 ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
-LOCALE_WHITELIST=$(PROJECT_BUILD_DIR)/locales.nopurge
-LOCALE_NOPURGE=$(strip $(subst ",,$(BR2_ENABLE_LOCALE_WHITELIST)))
-#"))
+LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
+LOCALE_NOPURGE=$(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))

 target-purgelocales:
 	rm -f $(LOCALE_WHITELIST)
@@ -394,33 +443,14 @@ external-deps:
 	@$(MAKE) -Bs BR2_WGET=$(TOPDIR)/toolchain/wget-show-external-deps.sh \
 		SPIDER=--spider source

-#############################################################
-#
-# Cleanup and misc junk
-#
-#############################################################
-clean: $(TARGETS_CLEAN)
-	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
+ifeq ($(BR2_CONFIG_CACHE),y)
+# drop configure cache if configuration is changed
+$(BUILD_DIR)/tgt-config.cache: .config
+	rm -f $@
+	touch $@

-dirclean: $(TARGETS_DIRCLEAN)
-	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
-
-distclean:
-ifeq ($(DL_DIR),$(BASE_DIR)/dl)
-	rm -rf $(DL_DIR)
+$(BASE_TARGETS): | $(BUILD_DIR)/tgt-config.cache
 endif
-	rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR) \
-	.config.cmd
-	$(MAKE) -C $(CONFIG) clean
-
-sourceball:
-	rm -rf $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR)
-	set -e; \
-	cd ..; \
-	rm -f buildroot.tar.bz2; \
-	tar -cvf buildroot.tar buildroot; \
-	bzip2 -9 buildroot.tar; \
-

 else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)

@@ -493,7 +523,6 @@ allyesconfig: $(CONFIG)/conf
 	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
 		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
 		$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
-	#sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config

 allnoconfig: $(CONFIG)/conf
 	@mkdir -p $(CONFIG)/buildroot-config
@@ -501,6 +530,33 @@ allnoconfig: $(CONFIG)/conf
 		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
 		$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)

+randpackageconfig: $(CONFIG)/conf
+	@mkdir -p $(CONFIG)/buildroot-config
+	@grep -v BR2_PACKAGE_ .config > .config.nopkg
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		KCONFIG_ALLCONFIG=.config.nopkg \
+		$(CONFIG)/conf -r $(CONFIG_CONFIG_IN)
+	@rm -f .config.nopkg
+
+allyespackageconfig: $(CONFIG)/conf
+	@mkdir -p $(CONFIG)/buildroot-config
+	@grep -v BR2_PACKAGE_ .config > .config.nopkg
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		KCONFIG_ALLCONFIG=.config.nopkg \
+		$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
+	@rm -f .config.nopkg
+
+allnopackageconfig: $(CONFIG)/conf
+	@mkdir -p $(CONFIG)/buildroot-config
+	@grep -v BR2_PACKAGE_ .config > .config.nopkg
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		KCONFIG_ALLCONFIG=.config.nopkg \
+		$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)
+	@rm -f .config.nopkg
+
 defconfig: $(CONFIG)/conf
 	@mkdir -p $(CONFIG)/buildroot-config
 	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
@@ -511,49 +567,43 @@ defconfig: $(CONFIG)/conf
 source-check: allyesconfig
 	$(MAKE) _source-check

+endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
+
 #############################################################
 #
 # Cleanup and misc junk
 #
 #############################################################
 clean:
-	rm -f .config .config.old .config.cmd .tmpconfig.h .lognr.*
-	-$(MAKE) -C $(CONFIG) clean
+	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
+		$(STAMP_DIR) $(BUILD_DIR) $(TOOLCHAIN_DIR)

 distclean: clean
-	rm -rf sources/*
-
-
-endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
+ifeq ($(DL_DIR),$(TOPDIR)/dl)
+	rm -rf $(DL_DIR)
+endif
+ifeq ($(O),output)
+	rm -rf $(O)
+endif
+	rm -rf .config .config.old .config.cmd .auto.deps
+	-$(MAKE) -C $(CONFIG) clean

 flush:
-	rm -f $(PROJECT_BUILD_DIR)/tgt-config.cache
+	rm -f $(BUILD_DIR)/tgt-config.cache

-%_defconfig: $(CONFIG)/conf
-	cp $(shell find ./target/ -name $@) .config
-	-@$(MAKE) oldconfig
-
-update:
-	cp .config $(BOARD_PATH)/$(PROJECT)_defconfig
+%_defconfig: $(TOPDIR)/configs/%_defconfig
+	cp $^ .config
+	@$(MAKE) oldconfig

 configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config

 prepatch:	gcc-patched binutils-patched gdb-patched uclibc-patched

-.lognr.$(PROJECT):
-	@echo "0" > .lognr.$(PROJECT)
-
-log:	.lognr.$(PROJECT)
-	@expr `cat .lognr.$(PROJECT)` + 1 > .lognr.$(PROJECT)	
-	@echo Creating $(PROJECT)-`cat .lognr.$(PROJECT)`.log
-	@$(MAKE) > $(PROJECT)-`cat .lognr.$(PROJECT)`.log 2>&1
-
-
 cross: $(BASE_TARGETS)

 help:
 	@echo 'Cleaning:'
-	@echo '  clean                  - delete temporary files created by build'
+	@echo '  clean                  - delete all files created by build'
 	@echo '  distclean              - delete all non-source files (including .config)'
 	@echo
 	@echo 'Build:'
@@ -561,11 +611,16 @@ help:
 	@echo
 	@echo 'Configuration:'
 	@echo '  menuconfig             - interactive curses-based configurator'
-	@echo '  xconfig		- interactive Qt-based configurator'
+	@echo '  xconfig                - interactive Qt-based configurator'
 	@echo '  oldconfig              - resolve any unresolved symbols in .config'
+	@echo '  randconfig             - New config with random answer to all options'
+	@echo '  defconfig              - New config with default answer to all options'
+	@echo '  allyesconfig           - New config where all options are accepted with yes'
+	@echo '  allnoconfig            - New config where all options are answered with no'
+	@echo '  randpackageconfig      - New config with random answer to package options'
+	@echo '  allyespackageconfig    - New config where pkg options are accepted with yes'
+	@echo '  allnopackageconfig     - New config where package options are answered with no'
 	@echo '  configured             - make {uclibc/busybox/linux26}-config'
-	@echo '  saveconfig             - save current configuration under local/<project>'
-	@echo '  getconfig              - restore saved configuration from local/<project>'
 	@echo
 	@echo 'Miscellaneous:'
 	@echo '  source                 - download all sources needed for offline-build'
@@ -573,15 +628,15 @@ help:
 	@echo '  external-deps          - list external packages used'
 	@echo '  flush                  - flush configuration cache'
 	@echo
+	@$(foreach b, $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig)), \
+	  printf "  %-35s - Build for %s\\n" $(b) $(b:_defconfig=);)
+	@echo
 	@echo 'See docs/README and docs/buildroot.html for further details'
 	@echo

-release: distclean
+release:
 	OUT=buildroot-$$(grep -A2 BR2_VERSION $(CONFIG_CONFIG_IN)|grep default|cut -f2 -d\"); \
-	rm -rf ../$$OUT*; cp -al . ../$$OUT; cd ..; \
-	tar cfz $$OUT.tar.gz --exclude .svn --exclude .git --exclude \*~ $$OUT; \
-	rm -rf $$OUT
+	git archive --format=tar --prefix=$$OUT/ master|gzip -9 >$$OUT.tar.gz

-.PHONY: dummy subdirs release distclean clean config oldconfig \
-	menuconfig xconfig tags check test depend defconfig help
+.PHONY: $(noconfig_targets)

--- a/target/device/Atmel/at91sam9260dfc/arm_toolchain_defconfig
+++ b/target/device/Atmel/at91sam9260dfc/arm_toolchain_defconfig
@@ -138,7 +138,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -156,7 +156,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="/usr/local/$(ARCH)/gcc-$(BR2_GCC_VERSION)-uclibc"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -190,17 +190,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y

 #
 # Kernel Header Options
@@ -628,7 +617,7 @@ BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -680,7 +669,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set

@@ -757,4 +746,3 @@ BR2_BOOTSOURCE=y
 BR2_KERNEL_none=y
 # BR2_KERNEL_LINUX_ADVANCED is not set
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
--- a/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig
+++ b/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig
@@ -143,7 +143,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -161,7 +161,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -195,17 +195,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y

 #
 # Kernel Header Options
@@ -283,7 +272,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"

 #
 # Gdb Options
@@ -343,7 +332,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -737,7 +726,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -788,7 +777,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -962,7 +951,6 @@ BR2_BOOTSOURCE=y
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/Atmel/at91rm9200df/at91rm9200df_ext_bare_defconfig
+++ b/target/device/Atmel/at91rm9200df/at91rm9200df_ext_bare_defconfig
@@ -138,7 +138,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -156,7 +156,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -190,19 +190,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
@@ -548,7 +537,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -600,7 +589,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set

@@ -676,4 +665,3 @@ BR2_BOOTSOURCE=y
 BR2_KERNEL_none=y
 # BR2_KERNEL_LINUX_ADVANCED is not set
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
--- a/target/device/Atmel/at91rm9200df/at91rm9200df_ext_defconfig
+++ b/target/device/Atmel/at91rm9200df/at91rm9200df_ext_defconfig
@@ -149,7 +149,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -167,7 +167,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -201,19 +201,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
@@ -268,7 +257,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -662,7 +651,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -713,7 +702,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -887,7 +876,6 @@ BR2_BOOTSOURCE=y
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
+++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
@@ -156,7 +156,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -174,7 +174,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -208,17 +208,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y

 #
 # Kernel Header Options
@@ -303,7 +292,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"

 #
 # Gdb Options
@@ -355,7 +344,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -751,7 +740,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -802,7 +791,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -977,7 +966,6 @@ BR2_BOOTSOURCE=y
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_bare_defconfig
+++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_bare_defconfig
@@ -138,7 +138,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -156,7 +156,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -190,17 +190,6 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
@@ -548,7 +537,7 @@ BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -600,7 +589,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set

@@ -677,4 +666,3 @@ BR2_BOOTSOURCE=y
 BR2_KERNEL_none=y
 # BR2_KERNEL_LINUX_ADVANCED is not set
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
--- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_defconfig
+++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_defconfig
@@ -157,7 +157,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -175,7 +175,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -209,19 +209,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
@@ -276,7 +265,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -670,7 +659,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -721,7 +710,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -896,7 +885,6 @@ BR2_BOOTSOURCE=y
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/Atmel/at91sam9260pf/at91sam9260pf_defconfig
+++ b/target/device/Atmel/at91sam9260pf/at91sam9260pf_defconfig
@@ -70,7 +70,7 @@ BR2_SOURCEFORGE_MIRROR="easynews"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX="wchar"
 BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
@@ -241,7 +241,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -499,7 +499,7 @@ BR2_PACKAGE_FBSET=y
 # other GUIs
 #
 # BR2_PACKAGE_QTE is not set
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_x11r7 is not set
 # BR2_PACKAGE_XSERVER_xorg is not set
@@ -533,8 +533,8 @@ BR2_PACKAGE_TSLIB=y
 BR2_COMPRESSOR_SUPPORT=y
 BR2_PACKAGE_GZIP=y
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 BR2_PACKAGE_LZMA_HOST=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
--- a/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig
+++ b/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig
@@ -159,7 +159,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -177,7 +177,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -211,17 +211,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y

 #
 # Kernel Header Options
@@ -306,7 +295,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"

 #
 # Gdb Options
@@ -349,7 +338,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -751,7 +740,7 @@ BR2_PACKAGE_FBSET=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -817,8 +806,8 @@ BR2_PACKAGE_TSLIB=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 BR2_PACKAGE_LZMA_HOST=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -1029,7 +1018,6 @@ BR2_BOOTSOURCE=y
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_FORMAT="uImage"
 BR2_KERNEL_CURRENT_VERSION="2.6.28.2"
--- a/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_bare_defconfig
+++ b/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_bare_defconfig
@@ -141,7 +141,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -159,7 +159,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -193,19 +193,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
@@ -551,7 +540,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -603,7 +592,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set

@@ -680,4 +669,3 @@ BR2_BOOTSOURCE=y
 BR2_KERNEL_none=y
 # BR2_KERNEL_LINUX_ADVANCED is not set
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
--- a/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_defconfig
+++ b/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_defconfig
@@ -160,7 +160,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -178,7 +178,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -212,19 +212,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 # BR2_KERNEL_HEADERS_2_4_31 is not set
 # BR2_KERNEL_HEADERS_2_6_20_4 is not set
 # BR2_KERNEL_HEADERS_2_6_20 is not set
@@ -307,7 +296,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -707,7 +696,7 @@ BR2_PACKAGE_FBSET=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -773,8 +762,8 @@ BR2_PACKAGE_TSLIB=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 BR2_PACKAGE_LZMA_HOST=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -985,7 +974,6 @@ BR2_BOOTSOURCE=y
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_FORMAT="uImage"
 BR2_KERNEL_CURRENT_VERSION="2.6.28.2"
--- a/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig
+++ b/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig
@@ -157,7 +157,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -175,7 +175,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -209,17 +209,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y

 #
 # Kernel Header Options
@@ -297,7 +286,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"

 #
 # Gdb Options
@@ -348,7 +337,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -748,7 +737,7 @@ BR2_PACKAGE_FBSET=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -814,8 +803,8 @@ BR2_PACKAGE_TSLIB=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 BR2_PACKAGE_LZMA_HOST=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -1026,7 +1015,6 @@ BR2_BOOTSOURCE=y
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_FORMAT="uImage"
 BR2_KERNEL_CURRENT_VERSION="2.6.28.2"
--- a/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_bare_defconfig
+++ b/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_bare_defconfig
@@ -140,7 +140,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -158,7 +158,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -192,19 +192,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
@@ -550,7 +539,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -602,7 +591,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set

@@ -679,4 +668,3 @@ BR2_BOOTSOURCE=y
 BR2_KERNEL_none=y
 # BR2_KERNEL_LINUX_ADVANCED is not set
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
--- a/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_defconfig
+++ b/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_defconfig
@@ -159,7 +159,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -177,7 +177,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -211,19 +211,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
@@ -269,7 +258,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -669,7 +658,7 @@ BR2_PACKAGE_FBSET=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -735,8 +724,8 @@ BR2_PACKAGE_TSLIB=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 BR2_PACKAGE_LZMA_HOST=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -947,7 +936,6 @@ BR2_BOOTSOURCE=y
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_FORMAT="uImage"
 BR2_KERNEL_CURRENT_VERSION="2.6.28.2"
--- a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig
+++ b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig
@@ -157,7 +157,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -175,7 +175,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -209,17 +209,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y

 #
 # Kernel Header Options
@@ -297,7 +286,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"

 #
 # Gdb Options
@@ -348,7 +337,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -685,7 +674,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -736,7 +725,7 @@ BR2_PACKAGE_XSERVER_none=y
 # Compressors / decompressors
 #
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -892,7 +881,6 @@ BR2_BOOTSOURCE=y
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_bare_defconfig
+++ b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_bare_defconfig
@@ -138,7 +138,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -156,7 +156,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -190,19 +190,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
@@ -548,7 +537,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -600,7 +589,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set

@@ -676,4 +665,3 @@ BR2_BOOTSOURCE=y
 BR2_KERNEL_none=y
 # BR2_KERNEL_LINUX_ADVANCED is not set
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
--- a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_defconfig
+++ b/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_defconfig
@@ -157,7 +157,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -175,7 +175,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -209,19 +209,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
@@ -276,7 +265,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -670,7 +659,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -721,7 +710,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -895,7 +884,6 @@ BR2_BOOTSOURCE=y
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/Atmel/atngw100-base/atngw100-base_defconfig
+++ b/target/device/Atmel/atngw100-base/atngw100-base_defconfig
@@ -91,7 +91,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="zcat"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -109,7 +109,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -139,33 +139,8 @@ BR2_UPDATE_CONFIG=y
 #
 # Toolchain
 #
-# BR2_TOOLCHAIN_BUILDROOT is not set
+BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-BR2_TOOLCHAIN_EXTERNAL_SOURCE=y
-BR2_TOOLCHAIN_SOURCE=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2 is not set
-BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3 is not set
-# BR2_TOOLCHAIN_UNKNOWNVENDOR is not set
-BR2_TOOLCHAIN_ATMEL_AVR32=y
-BR2_VENDOR_SITE="$(BR2_ATMEL_MIRROR)"
-BR2_VENDOR_SUFFIX="-avr32"
-BR2_VENDOR_BINUTILS_RELEASE="-1.0.1"
-BR2_VENDOR_GCC_RELEASE="-1.1.3"
-BR2_VENDOR_UCLIBC_RELEASE="-2.1.5"
-BR2_VENDOR_PATCH_DIR="Atmel/avr32"
-# BR2_EXT_GCC_VERSION_4_1_2 is not set
-# BR2_EXT_GCC_VERSION_4_2_1 is not set
-BR2_EXT_GCC_VERSION_4_2_2=y
-# BR2_EXT_GCC_VERSION_4_2_3 is not set
-# BR2_EXT_BINUTILS_VERSION_2_17 is not set
-BR2_EXT_BINUTILS_VERSION_2_18=y
-# BR2_EXT_UCLIBC_VERSION_0_9_28_3 is not set
-# BR2_EXT_UCLIBC_VERSION_0_9_29 is not set
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
-# BR2_EXT_UCLIBC_VERSION_0_9_30_1 is not set

 #
 # Kernel Header Options
@@ -185,11 +160,11 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.29.2"
 #
 # BR2_UCLIBC_VERSION_0_9_28_3 is not set
 # BR2_UCLIBC_VERSION_0_9_29 is not set
-BR2_UCLIBC_VERSION_0_9_30=y
-# BR2_UCLIBC_VERSION_0_9_30_1 is not set
+# BR2_UCLIBC_VERSION_0_9_30 is not se
+BR2_UCLIBC_VERSION_0_9_30_1=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.30"
-BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
+BR2_UCLIBC_VERSION_STRING="0.9.30.1"
+BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
 # BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
@@ -199,15 +174,16 @@ BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
 #
 # BR2_BINUTILS_VERSION_2_17 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
-BR2_BINUTILS_VERSION_2_18=y
+# BR2_BINUTILS_VERSION_2_18 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_3 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_6 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_9 is not set
+BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1=y
 # BR2_BINUTILS_VERSION_2_19 is not set
 # BR2_BINUTILS_VERSION_2_19_1 is not set
-BR2_BINUTILS_VERSION="2.18"
+BR2_BINUTILS_VERSION="2.18-avr32-1.0.1"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""

 #
@@ -217,7 +193,8 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 # BR2_GCC_VERSION_4_0_4 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
 # BR2_GCC_VERSION_4_2_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_2 is not set
+BR2_GCC_VERSION_4_2_2_AVR32_2_1_5=y
 # BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
 # BR2_GCC_VERSION_4_3_1 is not set
@@ -226,7 +203,7 @@ BR2_GCC_VERSION_4_2_2=y
 # BR2_GCC_VERSION_4_4_X is not set
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.2"
+BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 # BR2_TOOLCHAIN_SYSROOT is not set
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -277,7 +254,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y

 #
@@ -787,7 +764,6 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH=""
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-2.6.22.5.config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/Atmel/atngw100/atngw100_defconfig
+++ b/target/device/Atmel/atngw100/atngw100_defconfig
@@ -91,7 +91,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="zcat"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -109,7 +109,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -139,34 +139,8 @@ BR2_UPDATE_CONFIG=y
 #
 # Toolchain
 #
-# BR2_TOOLCHAIN_BUILDROOT is not set
+BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-BR2_TOOLCHAIN_EXTERNAL_SOURCE=y
-BR2_TOOLCHAIN_SOURCE=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2 is not set
-BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3 is not set
-# BR2_TOOLCHAIN_UNKNOWNVENDOR is not set
-BR2_TOOLCHAIN_ATMEL_AVR32=y
-BR2_VENDOR_SITE="$(BR2_ATMEL_MIRROR)"
-BR2_VENDOR_SUFFIX="-avr32"
-BR2_VENDOR_BINUTILS_RELEASE="-1.0.1"
-BR2_VENDOR_GCC_RELEASE="-1.1.3"
-BR2_VENDOR_UCLIBC_RELEASE="-2.1.5"
-BR2_VENDOR_GDB_RELEASE="-2.1.5"
-BR2_VENDOR_PATCH_DIR="Atmel/avr32"
-# BR2_EXT_GCC_VERSION_4_1_2 is not set
-# BR2_EXT_GCC_VERSION_4_2_1 is not set
-BR2_EXT_GCC_VERSION_4_2_2=y
-# BR2_EXT_GCC_VERSION_4_2_3 is not set
-# BR2_EXT_BINUTILS_VERSION_2_17 is not set
-BR2_EXT_BINUTILS_VERSION_2_18=y
-# BR2_EXT_UCLIBC_VERSION_0_9_28_3 is not set
-# BR2_EXT_UCLIBC_VERSION_0_9_29 is not set
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
-# BR2_EXT_UCLIBC_VERSION_0_9_30_1 is not set

 #
 # Kernel Header Options
@@ -186,11 +160,11 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.29.2"
 #
 # BR2_UCLIBC_VERSION_0_9_28_3 is not set
 # BR2_UCLIBC_VERSION_0_9_29 is not set
-BR2_UCLIBC_VERSION_0_9_30=y
-# BR2_UCLIBC_VERSION_0_9_30_1 is not set
+# BR2_UCLIBC_VERSION_0_9_30 is not set
+BR2_UCLIBC_VERSION_0_9_30_1=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.30"
-BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
+BR2_UCLIBC_VERSION_STRING="0.9.30.1"
+BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
 # BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
@@ -200,15 +174,16 @@ BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
 #
 # BR2_BINUTILS_VERSION_2_17 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
-BR2_BINUTILS_VERSION_2_18=y
+# BR2_BINUTILS_VERSION_2_18 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_3 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_6 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_9 is not set
+BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1=y
 # BR2_BINUTILS_VERSION_2_19 is not set
 # BR2_BINUTILS_VERSION_2_19_1 is not set
-BR2_BINUTILS_VERSION="2.18"
+BR2_BINUTILS_VERSION="2.18-avr32-1.0.1"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""

 #
@@ -218,7 +193,8 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 # BR2_GCC_VERSION_4_0_4 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
 # BR2_GCC_VERSION_4_2_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_2 is not set
+BR2_GCC_VERSION_4_2_2_AVR32_2_1_5=y
 # BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
 # BR2_GCC_VERSION_4_3_1 is not set
@@ -227,7 +203,7 @@ BR2_GCC_VERSION_4_2_2=y
 # BR2_GCC_VERSION_4_4_X is not set
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.2"
+BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -237,7 +213,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"

 #
 # Gdb Options
@@ -248,9 +224,10 @@ BR2_PACKAGE_GDB_HOST=y
 # BR2_GDB_VERSION_6_4 is not set
 # BR2_GDB_VERSION_6_5 is not set
 # BR2_GDB_VERSION_6_6 is not set
-BR2_GDB_VERSION_6_7_1=y
+# BR2_GDB_VERSION_6_7_1 is not set
+BR2_GDB_VERSION_6_7_1_AVR32_2_1_5=y
 # BR2_GDB_VERSION_6_8 is not set
-BR2_GDB_VERSION="6.7.1"
+BR2_GDB_VERSION="6.7.1-avr32-2.1.5"

 #
 # Common Toolchain Options
@@ -288,7 +265,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y

 #
@@ -611,7 +588,7 @@ BR2_PACKAGE_LINUX_FUSION=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -665,7 +642,7 @@ BR2_PACKAGE_LIBGLIB2=y
 #
 BR2_PACKAGE_LZO=y
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -800,7 +777,6 @@ BR2_TARGET_UBOOT_ETH1ADDR=""
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-2.6.29.2.config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/Atmel/atstk1005/atstk1005_defconfig
+++ b/target/device/Atmel/atstk1005/atstk1005_defconfig
@@ -89,7 +89,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="zcat"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -107,7 +107,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -139,33 +139,8 @@ BR2_UPDATE_CONFIG=y
 #
 # Toolchain
 #
-# BR2_TOOLCHAIN_BUILDROOT is not set
+BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-BR2_TOOLCHAIN_EXTERNAL_SOURCE=y
-BR2_TOOLCHAIN_SOURCE=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2 is not set
-BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3 is not set
-# BR2_TOOLCHAIN_UNKNOWNVENDOR is not set
-BR2_TOOLCHAIN_ATMEL_AVR32=y
-BR2_VENDOR_SITE="$(BR2_ATMEL_MIRROR)"
-BR2_VENDOR_SUFFIX="-avr32"
-BR2_VENDOR_BINUTILS_RELEASE="-1.0.1"
-BR2_VENDOR_GCC_RELEASE="-1.1.3"
-BR2_VENDOR_UCLIBC_RELEASE="-2.1.5"
-BR2_VENDOR_GDB_RELEASE="-2.1.5"
-BR2_VENDOR_PATCH_DIR="Atmel/avr32"
-# BR2_EXT_GCC_VERSION_4_1_2 is not set
-# BR2_EXT_GCC_VERSION_4_2_1 is not set
-BR2_EXT_GCC_VERSION_4_2_2=y
-# BR2_EXT_GCC_VERSION_4_2_3 is not set
-# BR2_EXT_BINUTILS_VERSION_2_17 is not set
-BR2_EXT_BINUTILS_VERSION_2_18=y
-# BR2_EXT_UCLIBC_VERSION_0_9_28_3 is not set
-# BR2_EXT_UCLIBC_VERSION_0_9_29 is not set
-BR2_EXT_UCLIBC_VERSION_0_9_30=y

 #
 # Kernel Header Options
@@ -193,9 +168,11 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.28.2"
 #
 # BR2_UCLIBC_VERSION_0_9_28_3 is not set
 # BR2_UCLIBC_VERSION_0_9_29 is not set
-BR2_UCLIBC_VERSION_0_9_30=y
+# BR2_UCLIBC_VERSION_0_9_30 is not set
+BR2_UCLIBC_VERSION_0_9_30_1=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
+BR2_UCLIBC_VERSION_STRING="0.9.30.1"
+BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
 # BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
@@ -205,14 +182,15 @@ BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
 #
 # BR2_BINUTILS_VERSION_2_17 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
-BR2_BINUTILS_VERSION_2_18=y
+# BR2_BINUTILS_VERSION_2_18 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_3 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_6 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_9 is not set
+BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1=y
 # BR2_BINUTILS_VERSION_2_19 is not set
-BR2_BINUTILS_VERSION="2.18"
+BR2_BINUTILS_VERSION="2.18-avr32-1.0.1"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""

 #
@@ -222,14 +200,15 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 # BR2_GCC_VERSION_4_0_4 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
 # BR2_GCC_VERSION_4_2_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_2 is not set
+BR2_GCC_VERSION_4_2_2_AVR32_2_1_5=y
 # BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
 # BR2_GCC_VERSION_4_3_1 is not set
 # BR2_GCC_VERSION_4_3_2 is not set
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.2"
+BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -251,10 +230,11 @@ BR2_PACKAGE_GDB_HOST=y
 # BR2_GDB_VERSION_6_4 is not set
 # BR2_GDB_VERSION_6_5 is not set
 # BR2_GDB_VERSION_6_6 is not set
-BR2_GDB_VERSION_6_7_1=y
+# BR2_GDB_VERSION_6_7_1 is not set
+BR2_GDB_VERSION_6_7_1_AVR32_2_1_5=y
 # BR2_GDB_VERSION_6_8 is not set
 # BR2_GDB_VERSION_SNAPSHOT is not set
-BR2_GDB_VERSION="6.7.1"
+BR2_GDB_VERSION="6.7.1-avr32-2.1.5"

 #
 # Common Toolchain Options
@@ -296,7 +276,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y

 #
@@ -656,7 +636,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -707,7 +687,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -817,7 +797,6 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH=""
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/Atmel/atstk100x/atstk100x_defconfig
+++ b/target/device/Atmel/atstk100x/atstk100x_defconfig
@@ -90,7 +90,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="zcat"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -108,7 +108,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -138,34 +138,8 @@ BR2_UPDATE_CONFIG=y
 #
 # Toolchain
 #
-# BR2_TOOLCHAIN_BUILDROOT is not set
+BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-BR2_TOOLCHAIN_EXTERNAL_SOURCE=y
-BR2_TOOLCHAIN_SOURCE=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2 is not set
-BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3 is not set
-# BR2_TOOLCHAIN_UNKNOWNVENDOR is not set
-BR2_TOOLCHAIN_ATMEL_AVR32=y
-BR2_VENDOR_SITE="$(BR2_ATMEL_MIRROR)"
-BR2_VENDOR_SUFFIX="-avr32"
-BR2_VENDOR_BINUTILS_RELEASE="-1.0.1"
-BR2_VENDOR_GCC_RELEASE="-1.1.3"
-BR2_VENDOR_UCLIBC_RELEASE="-2.1.5"
-BR2_VENDOR_GDB_RELEASE="-2.1.5"
-BR2_VENDOR_PATCH_DIR="Atmel/avr32"
-# BR2_EXT_GCC_VERSION_4_1_2 is not set
-# BR2_EXT_GCC_VERSION_4_2_1 is not set
-BR2_EXT_GCC_VERSION_4_2_2=y
-# BR2_EXT_GCC_VERSION_4_2_3 is not set
-# BR2_EXT_BINUTILS_VERSION_2_17 is not set
-BR2_EXT_BINUTILS_VERSION_2_18=y
-# BR2_EXT_UCLIBC_VERSION_0_9_28_3 is not set
-# BR2_EXT_UCLIBC_VERSION_0_9_29 is not set
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
-# BR2_EXT_UCLIBC_VERSION_0_9_30_1 is not set

 #
 # Kernel Header Options
@@ -185,11 +159,11 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.28.9"
 #
 # BR2_UCLIBC_VERSION_0_9_28_3 is not set
 # BR2_UCLIBC_VERSION_0_9_29 is not set
-BR2_UCLIBC_VERSION_0_9_30=y
-# BR2_UCLIBC_VERSION_0_9_30_1 is not set
+# BR2_UCLIBC_VERSION_0_9_30 is not set
+BR2_UCLIBC_VERSION_0_9_30_1=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.30"
-BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
+BR2_UCLIBC_VERSION_STRING="0.9.30.1"
+BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
 BR2_PROGRAM_INVOCATION=y
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
@@ -199,15 +173,16 @@ BR2_PROGRAM_INVOCATION=y
 #
 # BR2_BINUTILS_VERSION_2_17 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
-BR2_BINUTILS_VERSION_2_18=y
+# BR2_BINUTILS_VERSION_2_18 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_3 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_6 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_9 is not set
+BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1=y
 # BR2_BINUTILS_VERSION_2_19 is not set
 # BR2_BINUTILS_VERSION_2_19_1 is not set
-BR2_BINUTILS_VERSION="2.18"
+BR2_BINUTILS_VERSION="2.18-avr32-1.0.1"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""

 #
@@ -217,7 +192,8 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 # BR2_GCC_VERSION_4_0_4 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
 # BR2_GCC_VERSION_4_2_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_2 is not set
+BR2_GCC_VERSION_4_2_2_AVR32_2_1_5=y
 # BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
 # BR2_GCC_VERSION_4_3_1 is not set
@@ -226,7 +202,7 @@ BR2_GCC_VERSION_4_2_2=y
 # BR2_GCC_VERSION_4_4_X is not set
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.2"
+BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -248,10 +224,11 @@ BR2_PACKAGE_GDB_HOST=y
 # BR2_GDB_VERSION_6_4 is not set
 # BR2_GDB_VERSION_6_5 is not set
 # BR2_GDB_VERSION_6_6 is not set
-BR2_GDB_VERSION_6_7_1=y
+# BR2_GDB_VERSION_6_7_1 is not set
+BR2_GDB_VERSION_6_7_1_AVR32_2_1_5=y
 # BR2_GDB_VERSION_6_8 is not set
 # BR2_GDB_VERSION_SNAPSHOT is not set
-BR2_GDB_VERSION="6.7.1"
+BR2_GDB_VERSION="6.7.1-avr32-2.1.5"

 #
 # Common Toolchain Options
@@ -289,7 +266,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="target/device/Atmel/atstk100x/busybox-1.9.1.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_BUSYBOX_SKELETON=y

 #
@@ -686,14 +663,13 @@ BR2_PACKAGE_FBSET=y
 #
 # other GUIs
 #
-BR2_PACKAGE_QTOPIA4=y
-# BR2_PACKAGE_QTOPIA4_DEBUG is not set
-BR2_PACKAGE_QTOPIA4_SHARED=y
-# BR2_PACKAGE_QTOPIA4_STATIC is not set
-# BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL is not set
-# BR2_PACKAGE_QTOPIA4_LICENSE_APPROVED is not set
-# BR2_PACKAGE_QTOPIA4_QT3SUPPORT is not set
-BR2_PACKAGE_QTOPIA4_GUI_MODULE=y
+BR2_PACKAGE_QT=y
+# BR2_PACKAGE_QT_DEBUG is not set
+BR2_PACKAGE_QT_SHARED=y
+# BR2_PACKAGE_QT_STATIC is not set
+# BR2_PACKAGE_QT_LICENSE_APPROVED is not set
+# BR2_PACKAGE_QT_QT3SUPPORT is not set
+BR2_PACKAGE_QT_GUI_MODULE=y

 #
 # Pixel depths
@@ -702,63 +678,62 @@ BR2_PACKAGE_QTOPIA4_GUI_MODULE=y
 #
 # Deselecting each option leads to Qt's default (8,16,32)
 #
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL is not set
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1 is not set
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4 is not set
-BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8=y
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12 is not set
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15 is not set
-BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16=y
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18 is not set
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24 is not set
-BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32=y
-BR2_PACKAGE_QTOPIA4_GIF=y
-BR2_PACKAGE_QTOPIA4_LIBMNG=y
-BR2_PACKAGE_QTOPIA4_NOJPEG=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMJPEG is not set
-# BR2_PACKAGE_QTOPIA4_QTJPEG is not set
-BR2_PACKAGE_QTOPIA4_NOPNG=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMPNG is not set
-# BR2_PACKAGE_QTOPIA4_QTPNG is not set
-BR2_PACKAGE_QTOPIA4_NOTIFF=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMTIFF is not set
-# BR2_PACKAGE_QTOPIA4_QTTIFF is not set
-BR2_PACKAGE_QTOPIA4_QTZLIB=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMZLIB is not set
-BR2_PACKAGE_QTOPIA4_NOFREETYPE=y
-# BR2_PACKAGE_QTOPIA4_QTFREETYPE is not set
-# BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE is not set
-BR2_PACKAGE_QTOPIA4_EMB_PLATFORM="$(ARCH)"
-# BR2_PACKAGE_QTOPIA4_SQL_MODULE is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_1 is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_4 is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_8=y
+# BR2_PACKAGE_QT_PIXEL_DEPTH_12 is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_15 is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_16=y
+# BR2_PACKAGE_QT_PIXEL_DEPTH_18 is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_24 is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_32=y
+BR2_PACKAGE_QT_GIF=y
+BR2_PACKAGE_QT_LIBMNG=y
+BR2_PACKAGE_QT_NOJPEG=y
+# BR2_PACKAGE_QT_SYSTEMJPEG is not set
+# BR2_PACKAGE_QT_QTJPEG is not set
+BR2_PACKAGE_QT_NOPNG=y
+# BR2_PACKAGE_QT_SYSTEMPNG is not set
+# BR2_PACKAGE_QT_QTPNG is not set
+BR2_PACKAGE_QT_NOTIFF=y
+# BR2_PACKAGE_QT_SYSTEMTIFF is not set
+# BR2_PACKAGE_QT_QTTIFF is not set
+BR2_PACKAGE_QT_QTZLIB=y
+# BR2_PACKAGE_QT_SYSTEMZLIB is not set
+BR2_PACKAGE_QT_NOFREETYPE=y
+# BR2_PACKAGE_QT_QTFREETYPE is not set
+# BR2_PACKAGE_QT_SYSTEMFREETYPE is not set
+BR2_PACKAGE_QT_EMB_PLATFORM="$(ARCH)"
+# BR2_PACKAGE_QT_SQL_MODULE is not set

 #
 # Graphics drivers
 #
-BR2_PACKAGE_QTOPIA4_GFX_LINUXFB=y
-# BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED is not set
-# BR2_PACKAGE_QTOPIA4_GFX_QVFB is not set
-# BR2_PACKAGE_QTOPIA4_GFX_VNC is not set
-# BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN is not set
+BR2_PACKAGE_QT_GFX_LINUXFB=y
+# BR2_PACKAGE_QT_GFX_TRANSFORMED is not set
+# BR2_PACKAGE_QT_GFX_QVFB is not set
+# BR2_PACKAGE_QT_GFX_VNC is not set
+# BR2_PACKAGE_QT_GFX_MULTISCREEN is not set

 #
 # Mouse drivers
 #
-# BR2_PACKAGE_QTOPIA4_MOUSE_PC is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_BUS is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_YOPY is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_QVFB is not set
-# BR2_PACKAGE_QTOPIA4_PHONON is not set
-BR2_PACKAGE_QTOPIA4_XML=y
-# BR2_PACKAGE_QTOPIA4_XMLPATTERNS is not set
-# BR2_PACKAGE_QTOPIA4_SVG is not set
-BR2_PACKAGE_QTOPIA4_NETWORK=y
-# BR2_PACKAGE_QTOPIA4_WEBKIT is not set
-# BR2_PACKAGE_QTOPIA4_OPENSSL is not set
-BR2_PACKAGE_QTOPIA4_SCRIPT=y
-# BR2_PACKAGE_QTOPIA4_SCRIPTTOOLS is not set
+# BR2_PACKAGE_QT_MOUSE_PC is not set
+# BR2_PACKAGE_QT_MOUSE_BUS is not set
+# BR2_PACKAGE_QT_MOUSE_LINUXTP is not set
+# BR2_PACKAGE_QT_MOUSE_YOPY is not set
+# BR2_PACKAGE_QT_MOUSE_VR41XX is not set
+# BR2_PACKAGE_QT_MOUSE_TSLIB is not set
+# BR2_PACKAGE_QT_MOUSE_QVFB is not set
+# BR2_PACKAGE_QT_PHONON is not set
+BR2_PACKAGE_QT_XML=y
+# BR2_PACKAGE_QT_XMLPATTERNS is not set
+# BR2_PACKAGE_QT_SVG is not set
+BR2_PACKAGE_QT_NETWORK=y
+# BR2_PACKAGE_QT_WEBKIT is not set
+# BR2_PACKAGE_QT_OPENSSL is not set
+BR2_PACKAGE_QT_SCRIPT=y
+# BR2_PACKAGE_QT_SCRIPTTOOLS is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -812,7 +787,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_GZIP is not set
 BR2_PACKAGE_LZO=y
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -919,7 +894,6 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH=""
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/x86/i686/i386_defconfig
+++ b/target/device/x86/i686/i386_defconfig
@@ -91,7 +91,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -109,7 +109,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -141,18 +141,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
-BR2_EXT_UCLIBC_VERSION_0_9_30_1=y

 #
 # Kernel Header Options
@@ -276,7 +264,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -588,7 +576,7 @@ BR2_PACKAGE_MTD_SUMTOOL=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -642,7 +630,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 BR2_PACKAGE_LZO=y
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -738,7 +726,6 @@ BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="target/device/x86/i386/linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="bzImage"
--- a/target/device/x86/i686/i686_defconfig
+++ b/target/device/x86/i686/i686_defconfig
@@ -91,7 +91,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -109,7 +109,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -141,18 +141,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
-BR2_EXT_UCLIBC_VERSION_0_9_30_1=y

 #
 # Kernel Header Options
@@ -276,7 +264,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -588,7 +576,7 @@ BR2_PACKAGE_MTD_SUMTOOL=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -642,7 +630,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 BR2_PACKAGE_LZO=y
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -738,7 +726,6 @@ BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="bzImage"
--- a/target/device/ARMLTD/integrator926/integrator926_defconfig
+++ b/target/device/ARMLTD/integrator926/integrator926_defconfig
@@ -87,7 +87,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -105,7 +105,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -139,17 +139,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y

 #
 # Kernel Header Options
@@ -273,7 +262,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y

 #
@@ -640,7 +629,7 @@ BR2_PACKAGE_XSERVER_none=y
 # Compressors / decompressors
 #
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -743,7 +732,6 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH=""
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="target/device/ARMLTD/$(BR2_BOARD_NAME)/$(BR2_BOARD_NAME)-linux26-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig
+++ b/target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig
@@ -87,7 +87,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""

 #
@@ -105,7 +105,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -139,17 +139,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y

 #
 # Kernel Header Options
@@ -274,7 +263,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y

 #
@@ -561,7 +550,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set

@@ -616,8 +605,8 @@ BR2_PACKAGE_XSERVER_none=y
 # Compressors / decompressors
 #
 # BR2_PACKAGE_LZO is not set
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -719,7 +708,6 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH=""
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/KwikByte/kb9202/kb9202_defconfig
+++ b/target/device/KwikByte/kb9202/kb9202_defconfig
@@ -98,7 +98,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"

 #
 # Mirrors and Download locations
@@ -113,7 +113,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -145,13 +145,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y

 #
 # Kernel Header Options
@@ -268,7 +261,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set

 #
@@ -563,7 +556,7 @@ BR2_GRAPHIC_SUPPORT=y
 # other GUIs
 #
 # BR2_PACKAGE_QTE is not set
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_x11r7 is not set
 # BR2_PACKAGE_XSERVER_xorg is not set
@@ -632,7 +625,7 @@ BR2_X11_PREFIX="/usr"
 BR2_COMPRESSOR_SUPPORT=y
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set
 BR2_SCRIPTING_SUPPORT=y
@@ -696,7 +689,6 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
 # BR2_KERNEL_none is not set
 BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
--- a/target/device/valka/v100sc2_defconfig
+++ b/target/device/valka/v100sc2_defconfig
@@ -69,7 +69,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="zcat"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"

 #
 # Mirrors and Download locations
@@ -84,7 +84,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org"
 #
 BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/"
 BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_STAGING_DIR="$(BASE_DIR)/staging"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
@@ -115,30 +115,8 @@ BR2_UPDATE_CONFIG=y
 #
 # Toolchain
 #
-# BR2_TOOLCHAIN_BUILDROOT is not set
+BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-BR2_TOOLCHAIN_EXTERNAL_SOURCE=y
-BR2_TOOLCHAIN_SOURCE=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1 is not set
-BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3 is not set
-# BR2_TOOLCHAIN_UNKNOWNVENDOR is not set
-BR2_TOOLCHAIN_ATMEL_AVR32=y
-BR2_VENDOR_SITE="$(BR2_ATMEL_MIRROR)"
-BR2_VENDOR_SUFFIX="-avr32"
-BR2_VENDOR_BINUTILS_RELEASE="-2.1.5"
-BR2_VENDOR_GCC_RELEASE="-2.1.5"
-BR2_VENDOR_UCLIBC_RELEASE="-2.1.5"
-BR2_VENDOR_GDB_RELEASE="-2.1.5"
-BR2_VENDOR_PATCH_DIR="Atmel/avr32"
-# BR2_EXT_GCC_VERSION_4_1_2 is not set
-# BR2_EXT_GCC_VERSION_4_2_1 is not set
-BR2_EXT_GCC_VERSION_4_2_2=y
-# BR2_EXT_GCC_VERSION_4_2_3 is not set
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-# BR2_EXT_UCLIBC_VERSION_0_9_28_3 is not set

 #
 # Kernel Header Options
@@ -258,7 +236,7 @@ BR2_BUSYBOX_VERSION_1_12_X=y
 BR2_BUSYBOX_VERSION="1.12.1"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="target/device/valka/v100sc2/busybox.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_BUSYBOX_SKELETON=y

 #
@@ -542,57 +520,57 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-BR2_PACKAGE_QTOPIA4=y
-# BR2_PACKAGE_QTOPIA4_DEBUG is not set
-BR2_PACKAGE_QTOPIA4_SHARED=y
-# BR2_PACKAGE_QTOPIA4_STATIC is not set
-BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL=y
-# BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL is not set
-BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED=y
-# BR2_PACKAGE_QTOPIA4_QT3SUPPORT is not set
-BR2_PACKAGE_QTOPIA4_DEPTHS="-depths 24,16,8"
-BR2_PACKAGE_QTOPIA4_GIF=y
-# BR2_PACKAGE_QTOPIA4_LIBMNG is not set
-# BR2_PACKAGE_QTOPIA4_NOJPEG is not set
-# BR2_PACKAGE_QTOPIA4_SYSTEMJPEG is not set
-BR2_PACKAGE_QTOPIA4_QTJPEG=y
-# BR2_PACKAGE_QTOPIA4_NOPNG is not set
-# BR2_PACKAGE_QTOPIA4_SYSTEMPNG is not set
-BR2_PACKAGE_QTOPIA4_QTPNG=y
-# BR2_PACKAGE_QTOPIA4_NOTIFF is not set
-# BR2_PACKAGE_QTOPIA4_SYSTEMTIFF is not set
-BR2_PACKAGE_QTOPIA4_QTTIFF=y
-BR2_PACKAGE_QTOPIA4_QTZLIB=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMZLIB is not set
-# BR2_PACKAGE_QTOPIA4_NOFREETYPE is not set
-BR2_PACKAGE_QTOPIA4_QTFREETYPE=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE is not set
-BR2_PACKAGE_QTOPIA4_EMB_PLATFORM="avr32"
-# BR2_PACKAGE_QTOPIA4_SQL_MODULE is not set
+BR2_PACKAGE_QT=y
+# BR2_PACKAGE_QT_DEBUG is not set
+BR2_PACKAGE_QT_SHARED=y
+# BR2_PACKAGE_QT_STATIC is not set
+BR2_PACKAGE_QT_GPL_LICENSE_APPROVED=y
+# BR2_PACKAGE_QT_QT3SUPPORT is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_8=y
+BR2_PACKAGE_QT_PIXEL_DEPTH_16=y
+BR2_PACKAGE_QT_PIXEL_DEPTH_24=y
+BR2_PACKAGE_QT_GIF=y
+# BR2_PACKAGE_QT_LIBMNG is not set
+# BR2_PACKAGE_QT_NOJPEG is not set
+# BR2_PACKAGE_QT_SYSTEMJPEG is not set
+BR2_PACKAGE_QT_QTJPEG=y
+# BR2_PACKAGE_QT_NOPNG is not set
+# BR2_PACKAGE_QT_SYSTEMPNG is not set
+BR2_PACKAGE_QT_QTPNG=y
+# BR2_PACKAGE_QT_NOTIFF is not set
+# BR2_PACKAGE_QT_SYSTEMTIFF is not set
+BR2_PACKAGE_QT_QTTIFF=y
+BR2_PACKAGE_QT_QTZLIB=y
+# BR2_PACKAGE_QT_SYSTEMZLIB is not set
+# BR2_PACKAGE_QT_NOFREETYPE is not set
+BR2_PACKAGE_QT_QTFREETYPE=y
+# BR2_PACKAGE_QT_SYSTEMFREETYPE is not set
+BR2_PACKAGE_QT_EMB_PLATFORM="avr32"
+# BR2_PACKAGE_QT_SQL_MODULE is not set

 #
 # Graphics drivers
 #
-BR2_PACKAGE_QTOPIA4_GFX_LINUXFB=y
-# BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED is not set
-# BR2_PACKAGE_QTOPIA4_GFX_QVFB is not set
-BR2_PACKAGE_QTOPIA4_GFX_VNC=y
-BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN=y
+BR2_PACKAGE_QT_GFX_LINUXFB=y
+# BR2_PACKAGE_QT_GFX_TRANSFORMED is not set
+# BR2_PACKAGE_QT_GFX_QVFB is not set
+BR2_PACKAGE_QT_GFX_VNC=y
+BR2_PACKAGE_QT_GFX_MULTISCREEN=y

 #
 # Mouse drivers
 #
-# BR2_PACKAGE_QTOPIA4_MOUSE_PC is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_BUS is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_YOPY is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_QVFB is not set
-# BR2_PACKAGE_QTOPIA4_XMLPATTERNS is not set
-BR2_PACKAGE_QTOPIA4_SVG=y
-BR2_PACKAGE_QTOPIA4_WEBKIT=y
-BR2_PACKAGE_QTOPIA4_OPENSSL=y
+# BR2_PACKAGE_QT_MOUSE_PC is not set
+# BR2_PACKAGE_QT_MOUSE_BUS is not set
+# BR2_PACKAGE_QT_MOUSE_LINUXTP is not set
+# BR2_PACKAGE_QT_MOUSE_YOPY is not set
+# BR2_PACKAGE_QT_MOUSE_VR41XX is not set
+# BR2_PACKAGE_QT_MOUSE_TSLIB is not set
+# BR2_PACKAGE_QT_MOUSE_QVFB is not set
+# BR2_PACKAGE_QT_XMLPATTERNS is not set
+BR2_PACKAGE_QT_SVG=y
+BR2_PACKAGE_QT_WEBKIT=y
+BR2_PACKAGE_QT_OPENSSL=y

 #
 # X Window System server
@@ -653,7 +631,7 @@ BR2_PACKAGE_LIBGLIB2=y
 BR2_COMPRESSOR_SUPPORT=y
 # BR2_PACKAGE_GZIP is not set
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -752,4 +730,3 @@ BR2_TARGET_UBOOT_ETHADDR="04:25:fe:ed:00:18"
 BR2_KERNEL_none=y
 # BR2_KERNEL_LINUX_ADVANCED is not set
 # BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
--- a/docs/copyright.txt
+++ b/docs/copyright.txt
@@ -25,6 +25,6 @@ HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

 You have been warned.

-You can contact the webmaster at <andersen@codepoet.org> if you have some sort
+You can contact the webmaster at <buildroot@uclibc.org> if you have some sort
 of problem with this.

--- a/docs/docs.html
+++ b/docs/docs.html
@@ -2,15 +2,21 @@


 <h3>Documentation</h3>
-Current documentation for buildroot includes:
+Documentation for buildroot includes:

 <ul>

  <li>
-    <a href= "buildroot.html">Buildroot - Usage and
-    documentation</a> is where you want to start reading if you wish to
-    understand how buildroot work, or wish to change/extend/fix things.  If you
-    find any errors (factual, grammatical, whatever) please report them.
+    Usage and documentation is where you want to start reading if you
+    wish to understand how buildroot work, or wish to
+    change/extend/fix things. If you find any errors (factual,
+    grammatical, whatever) please report them. Choose between:
+    <p>
+    <ul>
+      <li><a href="/downloads/buildroot.html">Latest stable release</a></li>
+      <li><a href="buildroot.html">GIT head revision</a></li>
+    </ul>
+    <p>
  </li>

  <li>
@@ -20,7 +26,7 @@ Current documentation for buildroot includes:

  <li>
    If you find that you need help with buildroot, you can ask for help on the
-    <a href= "/lists/buildroot/">buildroot mailing list</a> at buildroot at mail.uclibc.org.
+    <a href= "lists.html">buildroot mailing list</a> at buildroot at uclibc.org.
    In addition the BusyBox, uClibc, and buildroot developers are also known to
    hang out on the uClibc IRC channel: #uclibc on irc.freenode.net.
  </li>
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,15 +6,23 @@

 <p>

-The latest stable release is <b>2009.05</b>, which can be downloaded
+The latest stable release is <b>2009.11</b>, which can be downloaded
 here:<p>

-<a href="/downloads/buildroot-2009.05.tar.gz">buildroot-2009.05.tar.gz</a>
+<a href="/downloads/buildroot-2009.11.tar.gz">buildroot-2009.11.tar.gz</a>
 or
-<a href="/downloads/buildroot-2009.05.tar.bz2">buildroot-2009.05.tar.bz2</a>.
+<a href="/downloads/buildroot-2009.11.tar.bz2">buildroot-2009.11.tar.bz2</a>.
 <p>

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

 <p>
@@ -35,4 +43,3 @@ follow development, but cannot or do not wish to use Git.
 </ul>

 <!--#include file="footer.html" -->
-
--- a/docs/lists.html
+++ b/docs/lists.html
@@ -22,8 +22,8 @@ list with frequently asked questions...

 <center>
 <form method="GET" action="http://www.google.com/custom">
-<input type="hidden" name="domains" value="buildroot.uclibc.org">
-<input type="hidden" name="sitesearch" value="buildroot.uclibc.org">
+<input type="hidden" name="domains" value="lists.busybox.net">
+<input type="hidden" name="sitesearch" value="lists.busybox.net">
 <input type="text" name="q" size="31" maxlength="255" value="">
 <br>
 <input type="submit" name="sa" value="search the mailing list archives">
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,121 @@
 <p>

 <ul>
+  <li><b>9 February 2010 -- 2010.02-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.02_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.02-rc1.tar.bz2">2010.02-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>1 December 2009 -- 2009.11 released</b>
+
+    <p>The stable 2009.11 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2009-December/030672.html">announcement</a>
+    or <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.11">CHANGES</a>
+    for more details, and go to the <a href="/downloads/">downloads page</a>
+    to pick up the <a href="/downloads/buildroot-2009.11.tar.bz2">2009.11
+    release</a>.</p>
+
+  <li><b>29 November 2009 -- 2009.11-rc2 released</b>
+
+    <p>RC2 is out with more cleanups and bugfixes, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.11_rc2">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.11-rc2.tar.bz2">2009.11-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>23 November 2009 -- 2009.11-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=2009.11_rc1">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.11-rc1.tar.bz2">2009.11-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>7 September 2009 -- First Buildroot Developer Day</b>
+
+    <p>The first <i>Buildroot Developer Day</i> will take place on
+    Saturday, October 17th in Grenoble, France, just the day after
+    Embedded Linux Conference Europe. This <i>Developer Day</i> aims
+    at allowing Buildroot developers to meet and exchange ideas on the
+    project and its future.</p>
+
+    <p>As the number of places is limited, interested candidates are
+    invited to send an e-mail to Peter Korsgaard (<code>jacmet at
+    uclibc dot org</code>) and Thomas Petazzoni (<code>thomas dot
+    petazzoni at free-electrons dot com</code>).</p>
+
+    <p>This <i>Developer Day</i> will take place thanks to the
+    sponsoring of <a href="http://www.calao-systems.com">Calao
+    Systems</a> and <a href="http://www.free-electrons.com">Free
+    Electrons</a>.</p>
+
+  <li><b>31 August 2009 -- 2009.08 released</b>
+
+    <p>The stable 2009.08 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2009-August/029018.html">announcement</a>
+    or <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.08">CHANGES</a>
+    for more details, and go to the <a href="/downloads/">downloads page</a>
+    to pick up the <a href="/downloads/buildroot-2009.08.tar.bz2">2009.08
+    release</a>.</p>
+
+  <li><b>26 August 2009 -- 2009.08-rc3 released</b>
+    <p>A number of bugfixes have been added to the tree since RC2
+    (especially thanks to Thomas Petazzoni) - See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.08_rc3">CHANGES</a>
+    file for details. This is very much expected to be the final release
+    candidate, so give it a good test and expect a final 2009.08
+    release next weekend unless critical issues are found.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.08-rc3.tar.bz2">2009.08-rc3
+    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>6 August 2009 -- 2009.08-rc2 released</b>
+
+    <p>RC2 is out with more cleanups and bugfixes, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.08_rc2">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.08-rc2.tar.bz2">2009.08-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>2 August 2009 -- 2009.08-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=2009.08_rc1">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.08-rc1.tar.bz2">2009.08-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>1 June 2009 -- 2009.05 released</b>

    <p>The stable 2009.05 release is out - Thanks to everyone
--- a/docs/stylesheet.css
+++ b/docs/stylesheet.css
@@ -49,6 +49,16 @@ h3 {
 	margin-left: 10px;
 	margin-right: 10px;
 	color: #336699;
+        border-bottom: 2px solid #336699;
+}
+
+h4 { 
+	font: italic normal 14pt georgia; 
+	letter-spacing: 1px; 
+	margin-bottom: 0px; 
+	margin-left: 10px;
+	margin-right: 10px;
+        border-bottom: 1px dashed black;
 }

 p {
--- a/package/Config.in
+++ b/package/Config.in
@@ -4,7 +4,7 @@ source "package/busybox/Config.in"

 comment "The minimum needed to build a uClibc development system"

-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bash/Config.in"
 source "package/bzip2/Config.in"
 source "package/coreutils/Config.in"
@@ -12,15 +12,15 @@ source "package/diffutils/Config.in"
 source "package/findutils/Config.in"
 endif
 source "package/flex/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gawk/Config.in"
 endif
 source "toolchain/gcc/Config.in.2"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/grep/Config.in"
 endif
 source "package/make/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/patch/Config.in"
 source "package/sed/Config.in"
 source "package/tar/Config.in"
@@ -41,7 +41,6 @@ source "package/gperf/Config.in"
 source "package/mpfr/Config.in"
 source "package/libtool/Config.in"
 source "package/m4/Config.in"
-source "package/mpatrol/Config.in"
 source "package/oprofile/Config.in"
 source "package/pkg-config/Config.in"
 source "package/readline/Config.in"
@@ -53,12 +52,12 @@ source "package/at/Config.in"
 source "package/beecrypt/Config.in"
 source "package/berkeleydb/Config.in"
 source "package/bsdiff/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
 endif
 source "package/cups/Config.in"
 source "package/customize/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dash/Config.in"
 endif
 source "package/enchant/Config.in"
@@ -66,7 +65,7 @@ source "package/file/Config.in"
 source "package/gamin/Config.in"
 source "package/icu/Config.in"
 source "package/kexec/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/less/Config.in"
 endif
 source "package/libconfig/Config.in"
@@ -88,16 +87,16 @@ 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_HIDE_OTHERS
+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_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/procps/Config.in"
 endif
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/psmisc/Config.in"
 endif
 source "package/screen/Config.in"
@@ -105,7 +104,7 @@ 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_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/sysklogd/Config.in"
 # busybox has init and the runit stuff
 source "package/sysvinit/Config.in"
@@ -115,28 +114,23 @@ endif

 source "package/database/Config.in"

-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-# busybox has an editor
-
 # text editors
 source "package/editors/Config.in"

-endif
-
 menu "Networking"

 comment "Networking applications"
 source "package/argus/Config.in"
 source "package/avahi/Config.in"
 source "package/axel/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+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_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
 endif
 source "package/dnsmasq/Config.in"
@@ -144,8 +138,8 @@ source "package/dropbear/Config.in"
 source "package/ethtool/Config.in"
 source "package/haserl/Config.in"
 source "package/hostap/Config.in"
+source "package/hostapd/Config.in"
 source "package/ifplugd/Config.in"
-#source "package/irda-utils/Config.in"
 source "package/iperf/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"
@@ -158,18 +152,18 @@ 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_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/lighttpd/Config.in"
 endif
 source "package/links/Config.in"
 source "package/lrzsz/Config.in"
-source "package/mdnsresponder/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/microcom/Config.in"
 endif
 source "package/mii-diag/Config.in"
@@ -178,11 +172,11 @@ source "package/mutt/Config.in"
 source "package/nbd/Config.in"
 source "package/ncftp/Config.in"
 source "package/neon/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/netcat/Config.in"
-endif
 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"
@@ -193,7 +187,6 @@ source "package/openntpd/Config.in"
 source "package/openssh/Config.in"
 source "package/openssl/Config.in"
 source "package/openvpn/Config.in"
-source "package/openswan/Config.in"
 source "package/portmap/Config.in"
 source "package/pppd/Config.in"
 source "package/radvd/Config.in"
@@ -203,27 +196,25 @@ 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"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/thttpd/Config.in"
 source "package/tinyhttpd/Config.in"
 endif
 source "package/tn5250/Config.in"
 source "package/ttcp/Config.in"
-#if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-# ATTENTION! This was merged into busybox!
-#source "package/udhcp/Config.in"
-#endif
 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_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/wget/Config.in"
 endif
 source "package/wireless-tools/Config.in"
@@ -236,7 +227,9 @@ 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"
@@ -245,8 +238,9 @@ 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_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/hdparm/Config.in"
 source "package/hotplug/Config.in"
 endif
@@ -267,15 +261,18 @@ source "package/ntfsprogs/Config.in"
 source "package/pciutils/Config.in"
 source "package/pcmcia/Config.in"
 source "package/setserial/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 # busybox has fdisk
 source "package/sfdisk/Config.in"
 endif
 source "package/smartmontools/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+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"
@@ -297,6 +294,7 @@ 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"
 source "package/imagemagick/Config.in"
 source "package/jpeg/Config.in"
@@ -310,6 +308,7 @@ source "package/sawman/Config.in"
 source "package/sdl/Config.in"
 source "package/sdl_image/Config.in"
 source "package/sdl_mixer/Config.in"
+source "package/sdl_sound/Config.in"
 source "package/sdl_net/Config.in"
 source "package/sdl_ttf/Config.in"
 source "package/sdl_gfx/Config.in"
@@ -377,9 +376,10 @@ endmenu

 menu "Compressors / decompressors"

-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gzip/Config.in"
 endif
+source "package/libarchive/Config.in"
 source "package/lzo/Config.in"
 source "package/lzop/Config.in"
 source "package/lzma/Config.in"
@@ -390,7 +390,7 @@ menu "Package managers"

 source "package/ipkg/Config.in"
 source "package/portage/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/rpm/Config.in"
 endif
 endmenu
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -1,343 +1,63 @@
 ################################################################################
+# Autotools package infrastructure
 #
-# Makefile.autotools.in --
+# This file implements an infrastructure that eases development of
+# package .mk files for autotools packages. It should be used for all
+# packages that use the autotools as their build system. Non-autotools
+# packages should use the generic infrastructure in
+# package/Makefile.package.in.
 #
-# Implicit and Generated Rules for easily creating autotools-compatible
-# buildroot packages
+# See the Buildroot documentation for details on the usage of this
+# infrastructure
 #
-## Example minimal makefile for a package named 'foo'
+# In terms of implementation, this autotools infrastructure requires
+# the .mk file to only specify metadata informations about the
+# package: name, version, download URL, etc.
 #
-# | FOO_VERSION = 1.0
-# | FOO_SOURCE = foo-$(FOO_VERSION).tar.gz
-# | FOO_SITE = http://www.libfoo.org/dist
-# | $(eval $(call AUTOTARGETS,package,foo))
+# We still allow the package .mk file to override what the different
+# steps are doing, if needed. For example, if <PKG>_BUILD_CMDS is
+# already defined, it is used as the list of commands to perform to
+# build the package, instead of the default autotools behaviour. The
+# package can also define some post operation hooks.
 #
-## The following targets can be called from the shell:
-#
-# foo, foo-source, foo-patch, foo-configure, foo-build, foo-install,
-# foo-install-target, foo-install-staging, foo-uninstall, foo-clean,
-# foo-dirclean
-#
-## The following variables which can be (re)defined in the package makefile:
-#
-# FOO_VERSION [mandatory]
-#	version string of the package
-# FOO_SOURCE [default foo-$(FOO_VERSION).tar.gz]
-#	file name of the package source
-# FOO_SITE [default sourceforge project "foo"]
-#	URL under wich $(FOO_SOURCE) can be found
-# FOO_DEPENDENCIES [default empty]
-#	list of (package) targets that must be built before foo
-# FOO_AUTORECONF [YES/NO, default NO]
-#	run <autoreconf> before <configure>
-# FOO_LIBTOOL_PATCH [YES/NO, default YES]
-#	Do you want the standard buildroot patch applied to ltmain.sh? (libtool)
-# FOO_USE_CONFIG_CACHE [YES/NO default $(BR2_CONFIG_CACHE)]
-#   Do you wany to use the central configure cache file? See BR2_CONFIG_CACHE.
-# FOO_CONF_ENV [default empty]
-#	environment passed to the <configure> script
-# FOO_CONF_OPT [default empty]
-#	arguments passed to the <configure> script
-# FOO_MAKE [default $(MAKE)]
-#	command to use to execute <make>
-# FOO_MAKE_ENV [default empty]
-#	environment passed to all calls to <make> in the package source
-#	directory
-# FOO_MAKE_OPT [default empty]
-#	arguments passed to <make> while building
-# FOO_INSTALL_STAGING [YES/NO, default NO]
-#	install the package to the staging directory
-# FOO_INSTALL_TARGET [YES/NO, default YES]
-#	install the package to the target directory
-# FOO_INSTALL_STAGING_OPT [default DESTDIR=$(STAGING_DIR) install]
-#	arguments passed to <make> while installing to the staging directory
-# FOO_INSTALL_TARGET_OPT [default DESTDIR=$(TARGET_DIR) install-exec/install-strip]
-#	arguments passed to <make> while installing to the target directory
-# FOO_CLEAN_OPT [default clean]
-#	arguments passed to <make> while installing to the staging directory
-# FOO_UNINSTALL_STAGING_OPT  [default DESTDIR=$(STAGING_DIR) uninstall]
-#	arguments passed to <make> while uninstalling from the staging
-#	directory
-# FOO_UNINSTALL_TARGET_OPT [default DESTDIR=$(TARGET_DIR) uninstall]
-#	arguments passed to <make> while uninstalling from the target
-#	directory
-# FOO_SUBDIR [default empty]
-#	relative path in the package source from which to run configure and
-#	make
-# FOO_DIR_PREFIX [default empty]
-#	toplevel relative path to package *.mk file and corresponding patches
-#
-## The following variables contain hook target names
-## by default they do nothing, they can be overriden in package makefiles
-#
-# FOO_HOOK_POST_EXTRACT, FOO_HOOK_POST_CONFIGURE,
-# FOO_HOOK_POST_BUILD, FOO_HOOK_POST_INSTALL
-#
-## The following variables contain targets that can be overriden
-#
-# FOO_TARGET_INSTALL_TARGET FOO_TARGET_INSTALL_STAGING FOO_TARGET_BUILD
-# FOO_TARGET_CONFIGURE FOO_TARGET_PATCH FOO_TARGET_EXTRACT FOO_TARGET_SOURCE
-# FOO_TARGET_UNINSTALL FOO_TARGET_CLEAN FOO_TARGET_DIRCLEAN
-#
-# E.g. if your package has a no <configure> script you can place the following
-# in your package makefile:
-#
-# | $(FOO_TARGET_INSTALL):
-# |	touch $@
-#
-## The following variables are defined automatically and can be used in
-## overriden targets:
-#
-# PKG
-#	is always the current package name ("foo" in the example)
-# FOO_DIR
-#	the directory in which the package source is extracted.
-#	the base name will always be foo-$(FOO_VERSION), no matter what the
-#	archive name or the directory-in-archive name are.
-# MESSAGE
-#	macro that outputs a pretty message to stdout, e.g. use
-#	$(call MESSAGE,"Hello World")
-#	in a target.
-#
-# Caveats:
-# - the 'eval' line (final line in the example) must be placed
-#   after all variable settings, but before all target re-definition
-#   (including hooks)
 ################################################################################

-# UPPERCASE Macro -- transform its argument to uppercase and replace dots and
-# hyphens to underscores
-UPPERCASE = $(shell echo $(1) | tr "a-z.-" "A-Z__")
-
-# Define extrators for different archive suffixes
-INFLATE.bz2 = $(BZCAT)
-INFLATE.gz  = $(ZCAT)
-INFLATE.tbz = $(BZCAT)
-INFLATE.tgz = $(ZCAT)
-INFLATE.tar = cat
-
-# MESSAGE Macro -- display a message in bold type
-MESSAGE = @echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
-TERM_BOLD := $(shell tput smso)
-TERM_RESET := $(shell tput rmso)
-
 ################################################################################
-# DOWNLOAD -- Download helper. Will try to download source from:
-# 1) BR2_PRIMARY_SITE if enabled
-# 2) Download site
-# 3) BR2_BACKUP_SITE if enabled
+# AUTOTARGETS_INNER -- defines how the configuration, compilation and
+# installation of an autotools package should be done, implements a
+# few hooks to tune the build process for autotools specifities and
+# calls the generic package infrastructure to generate the necessary
+# make targets
 #
-# Argument 1 is the source location
-# Argument 2 is the source filename
-#
-# E.G. use like this:
-# $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE))
+#  argument 1 is the lowercase package name
+#  argument 2 is the uppercase package name, including an HOST_ prefix
+#             for host packages
+#  argument 3 is the uppercase package name, without the HOST_ prefix
+#             for host packages
+#  argument 4 is the package directory prefix
+#  argument 5 is the type (target or host)
 ################################################################################

-# support make source-check/external-deps
-ifneq ($(SPIDER),)
-DOWNLOAD=$(WGET) -P $(DL_DIR) $(1)/$(2)
-else
-define DOWNLOAD
-	$(Q)test -e $(DL_DIR)/$(2) || \
-	for site in $(strip $(subst ",,$(BR2_PRIMARY_SITE))) $(1) $(strip $(subst ",,$(BR2_BACKUP_SITE))); \
-	do $(WGET) -P $(DL_DIR) $$site/$(2) && exit; done
-endef
-endif
-
-# Utility programs used to build packages
-TAR ?= tar
-#ACLOCAL_STAGING_DIR ?= $(STAGING_DIR)/usr/share/aclocal
-#ACLOCAL ?= aclocal -I $(ACLOCAL_STAGING_DIR)
-#AUTORECONF ?= autoreconf -v -i -f -I $(ACLOCAL_STAGING_DIR)
-#	ACLOCAL="$(ACLOCAL)"
-
-# Automatically detect tar --strip-path/components option
-TAR_STRIP_COMPONENTS := $(shell $(TAR) --help | grep strip-path > /dev/null ; if test $$? = 0 ; then echo '--strip-path' ; else echo '--strip-components' ; fi)
-
-################################################################################
-# Implicit targets -- produce a stamp file for each step of a package build
-################################################################################
-
-# Retrieve and unpack the archive
-$(BUILD_DIR)/%/.stamp_downloaded:
-# support make source-check/external-deps
-ifeq ($(SPIDER),)
-	$(call MESSAGE,"Downloading")
-endif
-	$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE))
-	$(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH)))
-ifeq ($(SPIDER),)
-	$(Q)mkdir -p $(@D)
-	$(Q)touch $@
-endif
-
-# Retrieve and unpack the archive
-$(BUILD_DIR)/%/.stamp_extracted:
-	$(call MESSAGE,"Extracting")
-	$(Q)mkdir -p $(@D)
-	$(Q)$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
-	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
-# some packages have messed up permissions inside
-	$(Q)chmod -R ug+rw $(@D)
-	$(Q)touch $@
-
-# Fix libtool support if required by the package
-$(BUILD_DIR)/%/.stamp_libtool_patch:
-	$(call MESSAGE,"Patching libtool")
-# if the package uses libtool, patch it for cross-compiling in buildroot
-	$(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES"; then \
-	for i in `find $(@D) -name ltmain.sh`; do \
-		toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \
-		done \
-	fi
-	$(Q)touch $@
-
-# Patch
-# XXX: FIXME: This has to be done differently and path-independent, i.e. use
-# XXX: FIXME: the dir-part of the stem as base-dir (instead of hardcoding
-# XXX: FIXME: "package/".
-$(BUILD_DIR)/%/.stamp_patched: NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
-$(BUILD_DIR)/%/.stamp_patched:
-	$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
-	$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
-	$(Q)( \
-	if test -d $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME); then \
-	  if test "$(wildcard $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER)*.patch*)"; then \
-	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
-	  else \
-	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch $($(PKG)_NAME)\*.patch.$(ARCH) || exit 1; \
-	    if test -d $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER); then \
-	      toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
-	    fi; \
-	  fi; \
-	fi; \
-	)
-ifeq ($(BR2_UPDATE_CONFIG),y)
-	$(Q)(for file in config.guess config.sub; do \
-		for i in $$(find $(@D) -name $$file); do \
-			cp package/gnuconfig/$$file $$i; \
-		done; \
-	done)
-endif
-	$(Q)touch $@
-
-# Running autoreconf
-$(BUILD_DIR)/%/.stamp_autoconfigured:
-	$(call MESSAGE,"Running autoreconf")
-	$(Q)cd $(@D)/$($(PKG)_SUBDIR) && $(AUTORECONF)
-# if the package uses libtool, patch it for cross-compiling in buildroot
-	$(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES"; then \
-		for i in `find $(@D)/$($(PKG)_SUBDIR) -name ltmain.sh`; do \
-		toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \
-		done \
-	fi
-	$(Q)touch $@
-
-# Configuring
-$(BUILD_DIR)/%/.stamp_configured:
-	$(call MESSAGE,"Configuring")
-	cd $(@D)/$($(PKG)_SUBDIR) && rm -f config.cache && \
-	$(TARGET_CONFIGURE_OPTS) \
-	$(TARGET_CONFIGURE_ARGS) \
-	$(TARGET_CONFIGURE_ENV) \
-	$($(PKG)_CONF_ENV) \
-	$(if $(THIS_SRCDIR),$(THIS_SRCDIR)/,./)configure \
-		$(if $(filter YES,$($(PKG)_USE_CONFIG_CACHE)),--cache-file="$(PROJECT_BUILD_DIR)/tgt-config.cache",) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--sysconfdir=/etc \
-		$(DISABLE_DOCUMENTATION) \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
-		$(QUIET) $($(PKG)_CONF_OPT)
-	$(Q)touch $@
-
-# Build
-$(BUILD_DIR)/%/.stamp_built:
-	$(call MESSAGE,"Building")
-	PATH=$(TARGET_PATH) $($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
-	$(Q)touch $@
-
-# Install to staging dir
-$(BUILD_DIR)/%/.stamp_staging_installed:
-	$(call MESSAGE,'Installing to host (staging directory)')
-	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
-#	toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
-	for i in $$(find $(STAGING_DIR)/usr/lib/ -name "*.la"); do \
-		cp $$i $$i~; \
-		$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$i; \
-	done
-	touch $@
-
-# Install to target dir
-$(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed:
-	$(call MESSAGE,"Installing to target")
-	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR)
-	$(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)
-	touch $@
-
-$(BUILD_DIR)/%/.stamp_cleaned:
-	$(call MESSAGE,"Cleaning up")
-	-$($(PKG)_MAKE_ENV) $($(PKG)_MAKE)  $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)
-	rm -f $(@D)/.stamp_built
-
-$(BUILD_DIR)/%/.stamp_uninstalled:
-	$(call MESSAGE,"Uninstalling")
-	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
-	rm -f $(@D)/.stamp_staging_installed
-	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
-	rm -f $($(PKG)_TARGET_INSTALL_TARGET) $($(PKG)_HOOK_POST_INSTALL)
-
-$(BUILD_DIR)/%/.stamp_dircleaned:
-	rm -Rf $(@D)
-
-
-################################################################################
-# AUTOTARGETS -- the target generator macro; define a set of human-readable
-# make targets, stamps, and default per-package variables.
-# Argument 1 is the package directory prefix.
-# Argument 2 is the (lowercase) package name.
-################################################################################
-
-define AUTOTARGETS
-$(call AUTOTARGETS_INNER,$(2),$(call UPPERCASE,$(2)),$(1))
-endef
-
-# AUTOTARGETS_INNER -- does the job for AUTOTARGETS; argument 1 is the
-# lowercase package name, argument 2 the uppercase package name,
-# argument 3 the package directory prefix
 define AUTOTARGETS_INNER

 # define package-specific variables to default values
-$(2)_NAME			=  $(1)
-$(2)_VERSION			?= undefined
-$(2)_DIR			=  $$(BUILD_DIR)/$(1)-$$($(2)_VERSION)
-$(2)_SOURCE			?= $(1)-$$($(2)_VERSION).tar.gz
-$(2)_SITE			?= \
-	http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/$(1)
-$(2)_DEPENDENCIES		?=
-$(2)_AUTORECONF			?= NO
-$(2)_LIBTOOL_PATCH		?= YES
-$(2)_USE_CONFIG_CACHE   ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
+ifndef $(2)_SUBDIR
+ ifdef $(3)_SUBDIR
+  $(2)_SUBDIR = $($(3)_SUBDIR)
+ else
+  $(2)_SUBDIR ?=
+ endif
+endif
+
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPT			?=
 $(2)_MAKE			?= $(MAKE)
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
-$(2)_INSTALL_STAGING		?= NO
-$(2)_INSTALL_TARGET		?= YES
+$(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
@@ -347,112 +67,205 @@ endif
 $(2)_CLEAN_OPT			?= clean
 $(2)_UNINSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) uninstall
 $(2)_UNINSTALL_TARGET_OPT	?= DESTDIR=$$(TARGET_DIR)  uninstall
-$(2)_SUBDIR			?=
-$(2)_DIR_PREFIX			=  $(if $(3),$(3),$(TOP_SRCDIR)/package)

+$(2)_SRCDIR                     = $$($(2)_DIR)/$($(2)_SUBDIR)

-# define sub-target stamps
-# targets which affect $(TARGET_DIR) must use a unique stamp for each $(PROJECT)
-$(2)_TARGET_INSTALL_TARGET =	$(PROJECT_BUILD_DIR)/autotools-stamps/$(1)_target_installed
-$(2)_TARGET_INSTALL_STAGING =	$$($(2)_DIR)/.stamp_staging_installed
-$(2)_TARGET_BUILD =		$$($(2)_DIR)/.stamp_built
-$(2)_TARGET_CONFIGURE =		$$($(2)_DIR)/.stamp_configured
-$(2)_TARGET_AUTORECONF =	$$($(2)_DIR)/.stamp_autoconfigured
-$(2)_TARGET_LIBTOOL_PATCH =	$$($(2)_DIR)/.stamp_libtool_patch
-$(2)_TARGET_PATCH =		$$($(2)_DIR)/.stamp_patched
-$(2)_TARGET_EXTRACT =		$$($(2)_DIR)/.stamp_extracted
-$(2)_TARGET_SOURCE =		$$($(2)_DIR)/.stamp_downloaded
-$(2)_TARGET_UNINSTALL =		$$($(2)_DIR)/.stamp_uninstalled
-$(2)_TARGET_CLEAN =		$$($(2)_DIR)/.stamp_cleaned
-$(2)_TARGET_DIRCLEAN =		$$($(2)_DIR)/.stamp_dircleaned
+#
+# Configure step. Only define it if not already defined by the package
+# .mk file. And take care of the differences between host and target
+# packages.
+#
+ifndef $(2)_CONFIGURE_CMDS
+ifeq ($(5),target)

-$(2)_HOOK_POST_EXTRACT =	$$($(2)_DIR)/.stamp_hook_post_extract
-$(2)_HOOK_POST_CONFIGURE =	$$($(2)_DIR)/.stamp_hook_post_configure
-$(2)_HOOK_POST_BUILD =		$$($(2)_DIR)/.stamp_hook_post_build
-$(2)_HOOK_POST_INSTALL =	$(PROJECT_BUILD_DIR)/autotools-stamps/$(1)_hook_post_install
-
-# human-friendly targets and target sequencing
-$(1):			$(1)-install
-$(1)-install:		$(1)-install-staging $(1)-install-target \
-			$$($(2)_HOOK_POST_INSTALL)
-
-ifeq ($$($(2)_INSTALL_TARGET),YES)
-$(1)-install-target:	$(1)-build $$($(2)_TARGET_INSTALL_TARGET)
+# Configure package for target
+define $(2)_CONFIGURE_CMDS
+	(cd $$($$(PKG)_SRCDIR) && rm -rf config.cache && \
+	$$(TARGET_CONFIGURE_OPTS) \
+	$$(TARGET_CONFIGURE_ARGS) \
+	$$(TARGET_CONFIGURE_ENV) \
+	$$($$(PKG)_CONF_ENV) \
+	./configure \
+		$(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) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--sysconfdir=/etc \
+		$$(DISABLE_DOCUMENTATION) \
+		$$(DISABLE_NLS) \
+		$$(DISABLE_LARGEFILE) \
+		$$(DISABLE_IPV6) \
+		$$(QUIET) $$($$(PKG)_CONF_OPT) \
+	)
+endef
 else
-$(1)-install-target:
+
+# Configure package for host
+define $(2)_CONFIGURE_CMDS
+	(cd $$($$(PKG)_SRCDIR) && rm -rf config.cache; \
+	        $$(HOST_CONFIGURE_OPTS) \
+		CFLAGS="$$(HOST_CFLAGS)" \
+		LDFLAGS="$$(HOST_LDFLAGS)" \
+		./configure \
+		--prefix="$$(HOST_DIR)/usr" \
+		--sysconfdir="$$(HOST_DIR)/etc" \
+		$$($$(PKG)_CONF_OPT) \
+	)
+endef
+endif
 endif

-ifeq ($$($(2)_INSTALL_STAGING),YES)
-$(1)-install-staging:	$(1)-build $$($(2)_TARGET_INSTALL_STAGING)
-else
-$(1)-install-staging:
-endif
-
-$(1)-build:		$(1)-configure \
-			$$($(2)_TARGET_BUILD) \
-			$$($(2)_HOOK_POST_BUILD)
-
-$(1)-configure:		$(1)-autoreconf \
-			$$($(2)_TARGET_CONFIGURE) \
-			$$($(2)_HOOK_POST_CONFIGURE)
-
-ifeq ($$($(2)_AUTORECONF),YES)
-$(1)-autoreconf:	$(1)-patch $$($(2)_TARGET_AUTORECONF)
-$(2)_DEPENDENCIES += host-automake host-autoconf host-libtool
-else
-$(1)-autoreconf:	$(1)-patch
-endif
-
-$(1)-patch:		$(1)-extract $$($(2)_TARGET_PATCH)
-
-$(1)-extract:		$(1)-depends \
-			$$($(2)_TARGET_EXTRACT) \
-			$$($(2)_HOOK_POST_EXTRACT) \
-			$$($(2)_TARGET_LIBTOOL_PATCH)
-
-$(1)-depends:		$(1)-source $$($(2)_DEPENDENCIES)
-
-$(1)-source:		$$($(2)_TARGET_SOURCE)
-
-# non-build targets
-$(1)-uninstall:	$(1)-configure $$($(2)_TARGET_UNINSTALL)
-
-$(1)-clean:		$(1)-uninstall \
-			$$($(2)_TARGET_CLEAN)
-
-$(1)-dirclean:		$$($(2)_TARGET_DIRCLEAN)
-
-# define the PKG variable for all targets, containing the
-# uppercase package variable prefix
-$$($(2)_TARGET_INSTALL_TARGET):		PKG=$(2)
-$$($(2)_TARGET_INSTALL_STAGING):	PKG=$(2)
-$$($(2)_TARGET_BUILD):			PKG=$(2)
-$$($(2)_TARGET_CONFIGURE):		PKG=$(2)
-$$($(2)_TARGET_LIBTOOL_PATCH):	PKG=$(2)
-$$($(2)_TARGET_AUTORECONF):		PKG=$(2)
-$$($(2)_TARGET_PATCH):			PKG=$(2)
-$$($(2)_TARGET_EXTRACT):		PKG=$(2)
-$$($(2)_TARGET_SOURCE):			PKG=$(2)
-$$($(2)_TARGET_UNINSTALL):		PKG=$(2)
-$$($(2)_TARGET_CLEAN):			PKG=$(2)
-$$($(2)_TARGET_DIRCLEAN):		PKG=$(2)
-$$($(2)_HOOK_POST_EXTRACT):		PKG=$(2)
-$$($(2)_HOOK_POST_CONFIGURE):	PKG=$(2)
-$$($(2)_HOOK_POST_BUILD):		PKG=$(2)
-$$($(2)_HOOK_POST_INSTALL):		PKG=$(2)
-
-# define hook targets
-# default hook behaviour: do nothing
-$$($(2)_HOOK_POST_EXTRACT):
-$$($(2)_HOOK_POST_CONFIGURE):
-$$($(2)_HOOK_POST_BUILD):
-$$($(2)_HOOK_POST_INSTALL):
-
-# add package to the general list of targets if requested by the buildroot
-# configuration
-ifeq ($$(BR2_PACKAGE_$(2)),y)
-TARGETS += $(1)
-endif
+#
+# Hook to update config.sub and config.guess if needed
+#
+define UPDATE_CONFIG_HOOK
+	for file in config.guess config.sub; do \
+		for i in $$$$(find $$(@D) -name $$$$file); do \
+			cp package/gnuconfig/$$$$file $$$$i; \
+		done; \
+	done
 endef

-# :mode=makefile:
+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
+#
+define LIBTOOL_PATCH_HOOK
+	@$(call MESSAGE,"Patching libtool")
+	$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" -a \
+	"$$($$(PKG)_AUTORECONF)" != "YES"; then \
+	for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
+		toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool.patch; \
+		done \
+	fi
+endef
+
+# default values are not evaluated yet, so don't rely on this defaulting to YES
+ifneq ($($(2)_LIBTOOL_PATCH),NO)
+$(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK
+endif
+
+#
+# Hook to autoreconf the package if needed
+#
+define AUTORECONF_HOOK
+	@$(call MESSAGE,"Autoreconfiguring")
+	$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
+	$(Q)if test "$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
+		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
+		toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \
+		done \
+	fi
+endef
+
+ifeq ($($(2)_AUTORECONF),YES)
+$(2)_POST_PATCH_HOOKS += AUTORECONF_HOOK
+$(2)_DEPENDENCIES += host-automake host-autoconf host-libtool
+endif
+
+#
+# Build step. Only define it if not already defined by the package .mk
+# file.
+#
+ifndef $(2)_BUILD_CMDS
+ifeq ($(5),target)
+define $(2)_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
+endef
+else
+define $(2)_BUILD_CMDS
+	$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
+endef
+endif
+endif
+
+#
+# Host installation step. Only define it if not already defined by the
+# package .mk file.
+#
+ifndef $(2)_INSTALL_CMDS
+define $(2)_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $$($$(PKG)_SRCDIR) install
+endef
+endif
+
+#
+# Staging installation step. Only define it if not already defined by
+# the package .mk file.
+#
+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~; \
+		$$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$$$i; \
+	done
+endef
+endif
+
+#
+# Target installation step. Only define it if not already defined by
+# the package .mk file.
+#
+ifndef $(2)_INSTALL_TARGET_CMDS
+define $(2)_INSTALL_TARGET_CMDS
+	$$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
+endef
+endif
+
+#
+# Clean step. Only define it if not already defined by
+# the package .mk file.
+#
+ifndef $(2)_CLEAN_CMDS
+define $(2)_CLEAN_CMDS
+	-$$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE)  $$($$(PKG)_CLEAN_OPT) -C $$($$(PKG)_SRCDIR)
+endef
+endif
+
+#
+# Uninstall from staging step. Only define it if not already defined by
+# the package .mk file.
+#
+ifndef $(2)_UNINSTALL_STAGING_CMDS
+define $(2)_UNINSTALL_STAGING_CMDS
+	$$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
+endef
+endif
+
+#
+# Uninstall from target step. Only define it if not already defined
+# by the package .mk file.
+#
+ifndef $(2)_UNINSTALL_TARGET_CMDS
+define $(2)_UNINSTALL_TARGET_CMDS
+	$$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
+endef
+endif
+
+# Call the generic package infrastructure to generate the necessary
+# make targets
+$(call GENTARGETS_INNER,$(1),$(2),$(3),$(4),$(5))
+
+endef
+
+################################################################################
+# AUTOTARGETS -- the target generator macro for autotools packages
+#
+# Argument 1 is the package directory prefix [mandatory]
+# Argument 2 is the lowercase package name   [mandatory]
+# Argument 3 is "target" or "host"           [optional, default: "target"]
+################################################################################
+
+define AUTOTARGETS
+ifeq ($(3),host)
+$(call AUTOTARGETS_INNER,$(3)-$(2),$(call UPPERCASE,$(3)-$(2)),$(call UPPERCASE,$(2)),$(1),host)
+else
+$(call AUTOTARGETS_INNER,$(2),$(call UPPERCASE,$(2)),$(call UPPERCASE,$(2)),$(1),target)
+endif
+endef
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -36,7 +36,7 @@ endif


 #########################################################################
-ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+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
@@ -45,12 +45,10 @@ TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
 TARGET_LDFLAGS+= $(BR2_SYSROOT)
 endif

-CC_TARGET_TUNE_:=$(strip $(subst ",,$(BR2_GCC_TARGET_TUNE)))
-#"))
-CC_TARGET_ARCH_:=$(strip $(subst ",,$(BR2_GCC_TARGET_ARCH)))
-#"))
-CC_TARGET_ABI_:=$(strip $(subst ",,$(BR2_GCC_TARGET_ABI)))
-#"))
+CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
+CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
+CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
+
 ifneq ($(CC_TARGET_TUNE_),)
 TARGET_CFLAGS+=-mtune=$(CC_TARGET_TUNE_)
 endif
@@ -99,7 +97,7 @@ TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/
 endif
 #########################################################################
 #ifeq ($(BR2_ROOTFS_SUFFIX),)
-ROOTFS_SUFFIX:=$(strip $(subst ",, $(BR2_ROOTFS_SUFFIX)))
+ROOTFS_SUFFIX:=$(call qstrip,$(BR2_ROOTFS_SUFFIX))
 ifeq ($(ROOTFS_SUFFIX),)
 ROOTFS_SUFFIX:=
 else
@@ -107,32 +105,23 @@ XXXX=xxxx
 ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
 endif

-ifeq ($(strip $(subst ",, $(BR2_FPU_SUFFIX))),y)
-COND_ARCH_FPU_SUFFIX:=$(ARCH_FPU_SUFFIX)
-else
-COND_ARCH_FPU_SUFFIX:=
-endif
-
-ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
-TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+TOOLCHAIN_DIR=$(BASE_DIR)/toolchain

 # Quotes are needed for spaces et al in path components.
-TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+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
-TOOLCHAIN_EXTERNAL_PREFIX:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PREFIX)))
-#"))
-TOOLCHAIN_EXTERNAL_PATH:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PATH)))
-#"))
-#TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX)
-TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
-TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
+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)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX)

 REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
 GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
@@ -144,11 +133,7 @@ TARGET_AS=$(TARGET_CROSS)as
 TARGET_CC=$(TARGET_CROSS)gcc
 TARGET_CPP=$(TARGET_CROSS)cpp
 TARGET_CXX=$(TARGET_CROSS)g++
-ifeq ($(BR2_GCC_VERSION_3_4_6),y)
-TARGET_FC=$(TARGET_CROSS)g77
-else
 TARGET_FC=$(TARGET_CROSS)gfortran
-endif
 TARGET_LD=$(TARGET_CROSS)ld
 TARGET_NM=$(TARGET_CROSS)nm
 TARGET_RANLIB=$(TARGET_CROSS)ranlib
@@ -178,10 +163,10 @@ TARGET_STRIP=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip
 STRIPCMD=$(TARGET_STRIP)
 endif
 ifeq ($(BR2_STRIP_none),y)
-TARGET_STRIP=true -Not_stripping
+TARGET_STRIP=true
 STRIPCMD=$(TARGET_STRIP)
 endif
-INSTALL=$(shell which install || type -p install)
+INSTALL:=$(shell which install || type -p install)
 FLEX:=$(shell which flex || type -p flex)
 BISON:=$(shell which bison || type -p bison)

@@ -207,8 +192,7 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 	-e 's/i[3-9]86/i386/' \
 	-e 's/xtensa.*/xtensa/' \
 	)
-GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX))
-#")
+GNU_HOST_NAME:=$(HOST_ARCH)-$(call qstrip,$(BR2_GNU_BUILD_SUFFIX))

 TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		AR="$(TARGET_AR)" \
@@ -243,7 +227,7 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		DEFAULT_LINKER="$(TARGET_LD)" \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig$(PKG_CONFIG_PATH)" \
+		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
 		STAGING_DIR="$(STAGING_DIR)"

 TARGET_CONFIGURE_ENV=\
@@ -252,6 +236,8 @@ TARGET_CONFIGURE_ENV=\
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FCFLAGS="$(TARGET_FCFLAGS)" \

+TARGET_MAKE_ENV=PATH=$(TARGET_PATH)
+
 HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		AR="$(HOSTAR)" \
 		AS="$(HOSTAS)" \
@@ -288,9 +274,12 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
 		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-		PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig$(PKG_CONFIG_PATH)"
+		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
+
+HOST_MAKE_ENV=PATH=$(HOST_PATH) \
+		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"

-HOST_MAKE_ENV=PATH=$(HOST_PATH)

 #######################################################################
 # settings we need to pass to configure
@@ -316,20 +305,6 @@ else
 BR2_AC_CV_C_BIGENDIAN=ac_cv_c_bigendian=no
 endif

-# XXX: FIXME: We would need to grab MALLOC_GLIBC_COMPAT from the uClibc.config
-# Including it doesn't seem wise, grepping is ugly.. Suggestions?
-# Does malloc return live pointer for malloc(0) ?
-ifeq ($(MALLOC_GLIBC_COMPAT),y)
-BR2_AC_CV_FUNC_MALLOC_0_NONNULL=ac_cv_func_malloc_0_nonnull=yes \
-				gl_cv_func_malloc_0_nonnull=yes \
-				ac_cv_func_realloc_0_nonnull=yes
-else
-BR2_AC_CV_FUNC_MALLOC_0_NONNULL=ac_cv_func_malloc_0_nonnull=no \
-				gl_cv_func_malloc_0_nonnull=no \
-				ac_cv_func_realloc_0_nonnull=no
-endif
-
-
 TARGET_CONFIGURE_ARGS= \
 	$(BR2_AC_CV_TRAP_CHECK) \
 	ac_cv_func_mmap_fixed_mapped=yes \
@@ -354,7 +329,7 @@ DISABLE_LARGEFILE= --disable-largefile
 endif

 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-DISABLE_DOCUMENTATION=--without-html-dir --disable-gtk-doc
+DISABLE_DOCUMENTATION=--disable-gtk-doc
 endif

 ifneq ($(BR2_INET_IPV6),y)
@@ -373,7 +348,7 @@ endif

 # X Windowing system

-X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX)))
-#"))
+X11_PREFIX:=$(call qstrip,$(BR2_X11_PREFIX))

 include package/Makefile.autotools.in
+include package/Makefile.package.in
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -0,0 +1,397 @@
+################################################################################
+# Generic package infrastructure
+#
+# This file implements an infrastructure that eases development of
+# package .mk files. It should be used for all non-autotools based
+# packages. Autotools-based packages should use the specialized
+# autotools infrastructure in package/Makefile.autotools.in.
+#
+# See the Buildroot documentation for details on the usage of this
+# infrastructure
+#
+# In terms of implementation, this generic infrastructure requires the
+# .mk file to specify:
+#
+#   1. Metadata informations about the package: name, version,
+#      download URL, etc.
+#
+#   2. Description of the commands to be executed to configure, build
+#      and install the package
+#
+# The autotools infrastructure specializes this generic infrastructure
+# by already implementing the configure, build and install steps.
+################################################################################
+
+# UPPERCASE Macro -- transform its argument to uppercase and replace dots and
+# hyphens to underscores
+UPPERCASE = $(shell echo $(1) | tr "a-z.-" "A-Z__")
+
+# Define extrators for different archive suffixes
+INFLATE.bz2 = $(BZCAT)
+INFLATE.gz  = $(ZCAT)
+INFLATE.tbz = $(BZCAT)
+INFLATE.tgz = $(ZCAT)
+INFLATE.tar = cat
+
+# MESSAGE Macro -- display a message in bold type
+MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
+TERM_BOLD := $(shell tput smso)
+TERM_RESET := $(shell tput rmso)
+
+################################################################################
+# DOWNLOAD -- Download helper. Will try to download source from:
+# 1) BR2_PRIMARY_SITE if enabled
+# 2) Download site
+# 3) BR2_BACKUP_SITE if enabled
+#
+# Argument 1 is the source location
+# Argument 2 is the source filename
+#
+# E.G. use like this:
+# $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE))
+################################################################################
+
+# support make source-check/external-deps
+ifneq ($(SPIDER),)
+DOWNLOAD=$(WGET) -P $(DL_DIR) $(1)/$(2)
+else
+define DOWNLOAD
+	$(Q)test -e $(DL_DIR)/$(2) || \
+	for site in $(call qstrip,$(BR2_PRIMARY_SITE)) $(1) $(call qstrip,$(BR2_BACKUP_SITE)); \
+	do $(WGET) -P $(DL_DIR) $$site/$(2) && exit; done
+endef
+endif
+
+# Utility programs used to build packages
+TAR ?= tar
+
+# Automatically detect tar --strip-path/components option
+TAR_STRIP_COMPONENTS := \
+  $(shell $(TAR) --help | grep strip-path > /dev/null ; \
+  if test $$? = 0 ; then \
+   echo '--strip-path' ; \
+  else \
+   echo '--strip-components' ; \
+  fi)
+
+# Needed for the foreach loops to loop over the list of hooks, so that
+# each hook call is properly separated by a newline.
+define sep
+
+
+endef
+
+################################################################################
+# Implicit targets -- produce a stamp file for each step of a package build
+################################################################################
+
+# Retrieve the archive
+$(BUILD_DIR)/%/.stamp_downloaded:
+# support make source-check/external-deps
+ifeq ($(SPIDER),)
+# Only show the download message if it isn't already downloaded
+	$(Q)(test -e $(DL_DIR)/$($(PKG)_SOURCE) && \
+		(test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \
+		$(call MESSAGE,"Downloading")
+endif
+	$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE))
+	$(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH)))
+ifeq ($(SPIDER),)
+	$(Q)mkdir -p $(@D)
+	$(Q)touch $@
+endif
+
+# Unpack the archive
+$(BUILD_DIR)/%/.stamp_extracted:
+	@$(call MESSAGE,"Extracting")
+	$(Q)mkdir -p $(@D)
+	$(Q)$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
+	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
+# some packages have messed up permissions inside
+	$(Q)chmod -R ug+rw $(@D)
+	$(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep))
+	$(Q)touch $@
+
+# Patch
+#
+# The NOHOSTPKG variable is the uppercased package name, without the
+# HOST_ prefix, even for host packages. This allows to find the
+# patches in the package directory, because $($(NOHOSTPKG)_NAME)
+# expands to the package directory name.
+#
+$(BUILD_DIR)/%/.stamp_patched: NAMEVER = $($(NOHOSTPKG)_NAME)-$($(PKG)_VERSION)
+$(BUILD_DIR)/%/.stamp_patched:
+	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
+	$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
+	$(Q)( \
+	if test -d $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME); then \
+	  if test "$(wildcard $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME)/$(NAMEVER)*.patch*)"; then \
+	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
+	  else \
+	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME) $($(NOHOSTPKG)_NAME)\*.patch $($(NOHOSTPKG)_NAME)\*.patch.$(ARCH) || exit 1; \
+	    if test -d $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER); then \
+	      toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
+	    fi; \
+	  fi; \
+	fi; \
+	)
+	$(foreach hook,$($(PKG)_POST_PATCH_HOOKS),$(call $(hook))$(sep))
+	$(Q)touch $@
+
+# Configure
+$(BUILD_DIR)/%/.stamp_configured:
+	@$(call MESSAGE,"Configuring")
+	$($(PKG)_CONFIGURE_CMDS)
+	$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
+	$(Q)touch $@
+
+# Build
+$(BUILD_DIR)/%/.stamp_built::
+	@$(call MESSAGE,"Building")
+	$($(PKG)_BUILD_CMDS)
+	$(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep))
+	$(Q)touch $@
+
+# Install to host dir
+$(BUILD_DIR)/%/.stamp_host_installed:
+	@$(call MESSAGE,'Installing to host directory')
+	$($(PKG)_INSTALL_CMDS)
+	$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))
+	$(Q)touch $@
+
+# Install to staging dir
+$(BUILD_DIR)/%/.stamp_staging_installed:
+	@$(call MESSAGE,'Installing to staging directory')
+	$($(PKG)_INSTALL_STAGING_CMDS)
+	$(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
+	$(Q)touch $@
+
+# Install to target dir
+$(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
+$(BUILD_DIR)/%/.stamp_cleaned:
+	@$(call MESSAGE,"Cleaning up")
+	$($(PKG)_CLEAN_CMDS)
+	rm -f $(@D)/.stamp_built
+
+# Uninstall package from target and staging
+$(BUILD_DIR)/%/.stamp_uninstalled:
+	@$(call MESSAGE,"Uninstalling")
+	$($(PKG)_UNINSTALL_STAGING_CMDS)
+	rm -f $($(PKG)_TARGET_INSTALL_STAGING)
+	$($(PKG)_UNINSTALL_TARGET_CMDS)
+	rm -f $($(PKG)_TARGET_INSTALL_TARGET) $($(PKG)_HOOK_POST_INSTALL)
+
+# Remove package sources
+$(BUILD_DIR)/%/.stamp_dircleaned:
+	rm -Rf $(@D)
+
+################################################################################
+# GENTARGETS_INNER -- generates the make targets needed to build a
+# generic package
+#
+#  argument 1 is the lowercase package name
+#  argument 2 is the uppercase package name, including an HOST_ prefix
+#             for host packages
+#  argument 3 is the uppercase package name, without the HOST_ prefix
+#             for host packages
+#  argument 4 is the package directory prefix
+#  argument 5 is the type (target or host)
+################################################################################
+
+define GENTARGETS_INNER
+
+# Define default values for various package-related variables, if not
+# already defined. For some variables (version, source, site and
+# subdir), if they are undefined, we try to see if a variable without
+# the HOST_ prefix is defined. If so, we use such a variable, so that
+# these informations have only to be specified once, for both the
+# target and host packages of a given .mk file.
+
+$(2)_TYPE                       =  $(5)
+$(2)_NAME			=  $(1)
+
+ifndef $(2)_VERSION
+ ifdef $(3)_VERSION
+  $(2)_VERSION = $($(3)_VERSION)
+ else
+  $(2)_VERSION = undefined
+ endif
+endif
+
+$(2)_DIR			=  $$(BUILD_DIR)/$(1)-$$($(2)_VERSION)
+
+ifndef $(2)_SOURCE
+ ifdef $(3)_SOURCE
+  $(2)_SOURCE = $($(3)_SOURCE)
+ else
+  $(2)_SOURCE			?= $(1)-$$($(2)_VERSION).tar.gz
+ endif
+endif
+
+ifndef $(2)_PATCH
+ ifdef $(3)_PATCH
+  $(2)_PATCH = $($(3)_PATCH)
+ endif
+endif
+
+ifndef $(2)_SITE
+ ifdef $(3)_SITE
+  $(2)_SITE = $($(3)_SITE)
+ else
+  $(2)_SITE			?= \
+	http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/$(1)
+ endif
+endif
+
+$(2)_DEPENDENCIES		?=
+$(2)_INSTALL_STAGING		?= NO
+$(2)_INSTALL_TARGET		?= YES
+$(2)_DIR_PREFIX			= $(if $(4),$(4),$(TOP_SRCDIR)/package)
+
+# define sub-target stamps
+$(2)_TARGET_INSTALL_TARGET =	$$($(2)_DIR)/.stamp_target_installed
+$(2)_TARGET_INSTALL_STAGING =	$$($(2)_DIR)/.stamp_staging_installed
+$(2)_TARGET_INSTALL_HOST =      $$($(2)_DIR)/.stamp_host_installed
+$(2)_TARGET_BUILD =		$$($(2)_DIR)/.stamp_built
+$(2)_TARGET_CONFIGURE =		$$($(2)_DIR)/.stamp_configured
+$(2)_TARGET_PATCH =		$$($(2)_DIR)/.stamp_patched
+$(2)_TARGET_EXTRACT =		$$($(2)_DIR)/.stamp_extracted
+$(2)_TARGET_SOURCE =		$$($(2)_DIR)/.stamp_downloaded
+$(2)_TARGET_UNINSTALL =		$$($(2)_DIR)/.stamp_uninstalled
+$(2)_TARGET_CLEAN =		$$($(2)_DIR)/.stamp_cleaned
+$(2)_TARGET_DIRCLEAN =		$$($(2)_DIR)/.stamp_dircleaned
+
+# new-style hooks
+$(2)_POST_EXTRACT_HOOKS         ?=
+$(2)_POST_PATCH_HOOKS           ?=
+$(2)_POST_CONFIGURE_HOOKS       ?=
+$(2)_POST_BUILD_HOOKS           ?=
+$(2)_POST_INSTALL_HOOKS         ?=
+$(2)_POST_INSTALL_STAGING_HOOKS ?=
+$(2)_POST_INSTALL_TARGET_HOOKS  ?=
+
+# old-style hooks
+$(2)_HOOK_POST_EXTRACT =	$$($(2)_DIR)/.stamp_hook_post_extract
+$(2)_HOOK_POST_CONFIGURE =	$$($(2)_DIR)/.stamp_hook_post_configure
+$(2)_HOOK_POST_BUILD =		$$($(2)_DIR)/.stamp_hook_post_build
+$(2)_HOOK_POST_INSTALL =	$$($(2)_DIR)/.stamp_hook_post_install
+
+# human-friendly targets and target sequencing
+$(1):			$(1)-install
+
+ifeq ($$($(2)_TYPE),host)
+$(1)-install:	        $(1)-install-host $$($(2)_HOOK_POST_INSTALL)
+else
+$(1)-install:		$(1)-install-staging $(1)-install-target \
+			$$($(2)_HOOK_POST_INSTALL)
+endif
+
+ifeq ($$($(2)_INSTALL_TARGET),YES)
+$(1)-install-target:	$(1)-build \
+			$$($(2)_TARGET_INSTALL_TARGET)
+else
+$(1)-install-target:
+endif
+
+ifeq ($$($(2)_INSTALL_STAGING),YES)
+$(1)-install-staging:	$(1)-build \
+			$$($(2)_TARGET_INSTALL_STAGING)
+else
+$(1)-install-staging:
+endif
+
+$(1)-install-host:      $(1)-build $$($(2)_TARGET_INSTALL_HOST)
+
+$(1)-build:		$(1)-configure \
+			$$($(2)_TARGET_BUILD) \
+			$$($(2)_HOOK_POST_BUILD)
+
+$(1)-configure:		$(1)-patch \
+			$$($(2)_TARGET_CONFIGURE) \
+			$$($(2)_HOOK_POST_CONFIGURE)
+
+$(1)-patch:		$(1)-extract $$($(2)_TARGET_PATCH)
+
+$(1)-extract:		$(1)-depends \
+			$$($(2)_TARGET_EXTRACT) \
+			$$($(2)_HOOK_POST_EXTRACT)
+
+$(1)-depends:		$(1)-source $$($(2)_DEPENDENCIES)
+
+$(1)-source:		$$($(2)_TARGET_SOURCE)
+
+$(1)-uninstall:		$(1)-configure $$($(2)_TARGET_UNINSTALL)
+
+$(1)-clean:		$(1)-uninstall \
+			$$($(2)_TARGET_CLEAN)
+
+$(1)-dirclean:		$$($(2)_TARGET_DIRCLEAN)
+
+# define the PKG variable for all targets, containing the
+# uppercase package variable prefix
+$$($(2)_TARGET_INSTALL_TARGET):		PKG=$(2)
+$$($(2)_TARGET_INSTALL_STAGING):	PKG=$(2)
+$$($(2)_TARGET_INSTALL_HOST):           PKG=$(2)
+$$($(2)_TARGET_BUILD):			PKG=$(2)
+$$($(2)_TARGET_CONFIGURE):		PKG=$(2)
+$$($(2)_TARGET_PATCH):			PKG=$(2)
+$$($(2)_TARGET_PATCH):			NOHOSTPKG=$(3)
+$$($(2)_TARGET_EXTRACT):		PKG=$(2)
+$$($(2)_TARGET_SOURCE):			PKG=$(2)
+$$($(2)_TARGET_UNINSTALL):		PKG=$(2)
+$$($(2)_TARGET_CLEAN):			PKG=$(2)
+$$($(2)_TARGET_DIRCLEAN):		PKG=$(2)
+$$($(2)_HOOK_POST_EXTRACT):		PKG=$(2)
+$$($(2)_HOOK_POST_CONFIGURE):		PKG=$(2)
+$$($(2)_HOOK_POST_BUILD):		PKG=$(2)
+$$($(2)_HOOK_POST_INSTALL):		PKG=$(2)
+
+# define hook targets
+# default hook behaviour: do nothing
+$$($(2)_HOOK_POST_EXTRACT):
+$$($(2)_HOOK_POST_CONFIGURE):
+$$($(2)_HOOK_POST_BUILD):
+$$($(2)_HOOK_POST_INSTALL):
+
+# add package to the general list of targets if requested by the buildroot
+# configuration
+
+ifeq ($$(BR2_PACKAGE_$(2)),y)
+TARGETS += $(1)
+endif
+endef
+
+################################################################################
+# GENTARGETS -- the target generator macro for generic packages
+#
+# Argument 1 is the package directory prefix [mandatory]
+# Argument 2 is the lowercase package name   [mandatory]
+# Argument 3 is "target" or "host"           [optional, default: "target"]
+################################################################################
+
+define GENTARGETS
+ifeq ($(3),host)
+# In the case of host packages, turn the package name "pkg" into "host-pkg"
+$(call GENTARGETS_INNER,$(3)-$(2),$(call UPPERCASE,$(3)-$(2)),$(call UPPERCASE,$(2)),$(1),host)
+else
+# In the case of target packages, keep the package name "pkg"
+$(call GENTARGETS_INNER,$(2),$(call UPPERCASE,$(2)),$(call UPPERCASE,$(2)),$(1),target)
+endif
+endef
+
+# :mode=makefile:
--- a/package/alsamixergui/Config.in
+++ b/package/alsamixergui/Config.in
@@ -1,4 +1,6 @@
 config BR2_PACKAGE_ALSAMIXERGUI
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_FLTK
 	bool "alsamixergui"
 	help
--- a/package/alsamixergui/alsamixergui.mk
+++ b/package/alsamixergui/alsamixergui.mk
@@ -10,9 +10,11 @@ ALSAMIXERGUI_AUTORECONF = YES
 ALSAMIXERGUI_INSTALL_STAGING = NO
 ALSAMIXERGUI_INSTALL_TARGET = YES

-ALSAMIXERGUI_CONF_OPT = LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lstdc++ -lX11"
+ALSAMIXERGUI_CONF_ENV = ac_cv_lib_fltk_numericsort=yes \
+			ac_cv_lib_fltk_fl_numericsort=yes \
+			ac_cv_lib_asound_snd_ctl_open=yes

-ALSAMIXERGUI_DEPENDENCIES = uclibc fltk
+ALSAMIXERGUI_DEPENDENCIES = fltk alsa-lib

 $(eval $(call AUTOTARGETS,package,alsamixergui))

--- a/package/argus/argus.mk
+++ b/package/argus/argus.mk
@@ -35,7 +35,7 @@ $(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked
 	(cd $(ARGUS_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -51,7 +51,7 @@ $(TARGET_DIR)/$(ARGUS_TARGET_BINARY): $(ARGUS_DIR)/$(ARGUS_BINARY)
 	cp -dpf $(ARGUS_DIR)/$(ARGUS_BINARY) $@
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $@

-argus: uclibc libpcap $(TARGET_DIR)/$(ARGUS_TARGET_BINARY)
+argus: libpcap $(TARGET_DIR)/$(ARGUS_TARGET_BINARY)

 argus-clean:
 	-$(MAKE) -C $(ARGUS_DIR) clean
--- a/package/at/S99at
+++ b/package/at/S99at
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Starts at daemon
+#
+
+umask 077
+
+start() {
+	echo -n "Starting atd: "
+	start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/atd.pid --background --exec /usr/sbin/atd -- -f
+	echo "OK"
+}
+stop() {
+	echo -n "Stopping atd: "
+	start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid
+	echo "OK"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	restart
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
--- a/package/at/at-3.1.12-0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
+++ b/package/at/at-3.1.12-0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
@@ -0,0 +1,33 @@
+From a182f18fa3b9fb3dd817b601b51c758f9a77f407 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Tue, 1 Dec 2009 17:08:14 +0100
+Subject: [PATCH 1/5] configure.ac: remove manual compiler check with AC_TRY_RUN
+
+AC_TRY_RUN breaks cross compilation, so remove it. autotools will take
+care about a working (cross-) compiler.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ configure.ac |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a8c2a14..997a37f 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -38,12 +38,6 @@ case "$host" in
+     AC_MSG_RESULT(no)
+     ;;
+ esac
+-AC_MSG_CHECKING(Trying to compile a trivial ANSI C program)
+-AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
+-    AC_MSG_RESULT(yes),
+-    AC_MSG_RESULT(no)
+-    AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.),
+-    AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.))
+ 
+ AC_MSG_CHECKING(__attribute__((noreturn)))
+ AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
+-- 
+1.6.5.3
+
--- a/package/at/at-3.1.12-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
+++ b/package/at/at-3.1.12-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
@@ -0,0 +1,34 @@
+From e12c96cccab550eda31cf7bb1dedddd3670ffe69 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Tue, 1 Dec 2009 17:22:22 +0100
+Subject: [PATCH 2/5] configure.ac: convert AC_TRY_COMPILE -> AC_COMPILE_IFELSE
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ configure.ac |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 997a37f..cab80ed 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -40,11 +40,11 @@ case "$host" in
+ esac
+ 
+ AC_MSG_CHECKING(__attribute__((noreturn)))
+-AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
+-    AC_MSG_RESULT(yes)
+-    AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1,
+-	      [Define to 1 if compiler supports __attribute__((noreturn))]),
+-    AC_MSG_RESULT(no)
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM([[]], [[void __attribute__((noreturn)) panic(void);]])],
+	[AC_MSG_RESULT(yes)
+	 AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, Define to 1 if compiler supports __attribute__((noreturn)))],
+	[AC_MSG_RESULT(no)]
+ )
+ dnl Checks for libraries.
+ 
+-- 
+1.6.5.3
+
--- a/package/at/at-3.1.12-0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
+++ b/package/at/at-3.1.12-0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
@@ -0,0 +1,38 @@
+From 8720a71757f3626bf3bbc3a7aa2185e6387e5689 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Tue, 1 Dec 2009 20:37:31 +0100
+Subject: [PATCH 3/5] Makefile.in: add LDFLAGS to linking stage
+
+The linking stage ignores the LDFLAGS, this breaks if the flex library
+lives in a non standard location.
+
+This patch add LDFLAGS to both "at" and "atd" linking stage.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Makefile.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index dae6b7d..b766bbb 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -65,13 +65,13 @@ LIST = Filelist Filelist.asc
+ all: at atd atrun
+ 
+ at: $(ATOBJECTS)
+-	$(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
+ 	rm -f $(CLONES)
+ 	$(LN_S) -f at atq
+ 	$(LN_S) -f at atrm
+ 
+ atd: $(RUNOBJECTS)
+-	$(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
+ 
+ y.tab.c y.tab.h: parsetime.y
+ 	$(YACC) -d parsetime.y
+-- 
+1.6.5.3
+
--- a/package/at/at-3.1.12-0005-Makefile.in-replace-IROOT-by-DESTDIR.patch
+++ b/package/at/at-3.1.12-0005-Makefile.in-replace-IROOT-by-DESTDIR.patch
@@ -0,0 +1,97 @@
+From 195d30e2e01fe2f91ed3bdaeec3982aa66b309dd Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Tue, 1 Dec 2009 20:57:45 +0100
+Subject: [PATCH 5/5] Makefile.in: replace IROOT by DESTDIR
+
+This patch replaces IROOT by DESTDIR, which is the autotools standard
+variable. For backwards compatibilty IROOT overwrites the DESTDIR.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Makefile.in |   64 +++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 34 insertions(+), 30 deletions(-)
+
+Index: at-3.1.12/Makefile.in
+===================================================================
+--- at-3.1.12.orig/Makefile.in
+++ at-3.1.12/Makefile.in
+@@ -16,6 +16,10 @@ docdir		= $(prefix)/doc
+ atdocdir	= $(docdir)/at
+ etcdir		= @ETCDIR@
+ 
+ifdef IROOT
+DESTDIR		= $(IROOT)
+endif
+
+ DAEMON_USERNAME	= @DAEMON_USERNAME@
+ DAEMON_GROUPNAME= @DAEMON_GROUPNAME@
+ LOADAVG_MX	= @LOADAVG_MX@
+@@ -86,38 +90,38 @@ atrun: atrun.in
+ 	$(CC) -c $(CFLAGS) $(DEFS) $*.c
+ 
+ install: all
+-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir)
+-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir)
+-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir)
+-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir)
+-	$(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir)
+-	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
+-	chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
+-	touch $(IROOT)$(LFILE)
+-	chmod 600 $(IROOT)$(LFILE)
+-	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
+-	test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
+-	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir)
+-	$(LN_S) -f at $(IROOT)$(bindir)/atq
+-	$(LN_S) -f at $(IROOT)$(bindir)/atrm
+-	$(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
+-	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
+-	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
+-	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
+-	$(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir)
+-	$(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
+-	$(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
+-	cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
+-	$(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/
+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir)
+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir)
+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir)
+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir)
+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir)
+	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
+	chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
+	touch $(DESTDIR)$(LFILE)
+	chmod 600 $(DESTDIR)$(LFILE)
+	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)
+	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/
+	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir)
+	$(LN_S) -f at $(DESTDIR)$(bindir)/atq
+	$(LN_S) -f at $(DESTDIR)$(bindir)/atrm
+	$(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir)
+	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir)
+	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir)
+	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir)
+	$(INSTALL) -g root -o root -m 755 -s atd $(DESTDIR)$(sbindir)
+	$(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir)
+	$(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/
+	cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
+	$(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/
+ 	sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
+-	$(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
+	$(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
+ 	rm -f tmpman
+-	$(INSTALL) -g root -o root -m 644 at_allow.5 $(IROOT)$(man5dir)/
+-	cd $(IROOT)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 
+-	$(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir)
+-	rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \
+-		$(IROOT)$(mandir)/cat1/atq.1*
+-	rm -f $(IROOT)$(mandir)/cat1/atd.8*
+	$(INSTALL) -g root -o root -m 644 at_allow.5 $(DESTDIR)$(man5dir)/
+	cd $(DESTDIR)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 
+	$(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
+	rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \
+		$(DESTDIR)$(mandir)/cat1/atq.1*
+	rm -f $(DESTDIR)$(mandir)/cat1/atd.8*
+ 
+ dist: checkin $(DIST) $(LIST) Filelist.asc
+ 	(cd ..; tar cf - `for a in $(DIST) $(LIST); do echo at-$(VERSION)/$$a; done` |\
--- a/package/at/at-3.1.12-0006-Makefile.in-make-install-fix.patch
+++ b/package/at/at-3.1.12-0006-Makefile.in-make-install-fix.patch
@@ -0,0 +1,69 @@
+[PATCH]: Makefile.in: fix make install for non-root, don't strip
+
+Buildroot will ensure all files are owned by root and stripped anyway
+(if needed) before the rootfs is created.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ Makefile.in |   39 +++++++++++++++++++--------------------
+ 1 file changed, 19 insertions(+), 20 deletions(-)
+
+Index: at-3.1.12/Makefile.in
+===================================================================
+--- at-3.1.12.orig/Makefile.in
+++ at-3.1.12/Makefile.in
+@@ -90,35 +90,34 @@ atrun: atrun.in
+ 	$(CC) -c $(CFLAGS) $(DEFS) $*.c
+ 
+ install: all
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir)
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir)
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir)
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir)
+-	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir)
+-	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(etcdir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(sbindir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(atdocdir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
+ 	chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
+ 	touch $(DESTDIR)$(LFILE)
+ 	chmod 600 $(DESTDIR)$(LFILE)
+-	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)
+-	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/
+-	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir)
+	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -m 640 at.deny $(DESTDIR)$(etcdir)/
+	$(INSTALL) -m 6755 at $(DESTDIR)$(bindir)
+ 	$(LN_S) -f at $(DESTDIR)$(bindir)/atq
+ 	$(LN_S) -f at $(DESTDIR)$(bindir)/atrm
+-	$(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir)
+-	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir)
+-	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir)
+-	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir)
+-	$(INSTALL) -g root -o root -m 755 -s atd $(DESTDIR)$(sbindir)
+-	$(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir)
+-	$(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/
+	$(INSTALL) -m 755 batch $(DESTDIR)$(bindir)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+	$(INSTALL) -m 755 atd $(DESTDIR)$(sbindir)
+	$(INSTALL) -m 755 atrun $(DESTDIR)$(sbindir)
+	$(INSTALL) -m 644 at.1 $(DESTDIR)$(man1dir)/
+ 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
+-	$(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/
+	$(INSTALL) -m 644 atd.8 $(DESTDIR)$(man8dir)/
+ 	sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
+-	$(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
+	$(INSTALL) -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
+ 	rm -f tmpman
+-	$(INSTALL) -g root -o root -m 644 at_allow.5 $(DESTDIR)$(man5dir)/
+	$(INSTALL) -m 644 at_allow.5 $(DESTDIR)$(man5dir)/
+ 	cd $(DESTDIR)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 
+-	$(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
+	$(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
+ 	rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \
+ 		$(DESTDIR)$(mandir)/cat1/atq.1*
+ 	rm -f $(DESTDIR)$(mandir)/cat1/atd.8*
--- a/package/at/at-3.1.12-0007-getloadavg-fix.patch
+++ b/package/at/at-3.1.12-0007-getloadavg-fix.patch
@@ -0,0 +1,30 @@
+[PATCH]: fix getloadavg.c compilation, revert to 3.1.10 version
+
+getloadavg.c shipped with 3.1.12 doesn't compile because it references
+headers not shipped. Fix it by simply reverting to the 3.1.10 version.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ getloadavg.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+Index: at-3.1.12/getloadavg.c
+===================================================================
+--- at-3.1.12.orig/getloadavg.c
+++ at-3.1.12/getloadavg.c
+@@ -66,11 +66,12 @@ Boston, MA  02110-1301  USA */
+ 
+ /* This should always be first.  */
+ #ifdef HAVE_CONFIG_H
+-#include <config.h>
+#include "config.h"
+ #endif
+ 
+-#include "lisp.h"
+-#include "sysfile.h" /* for encapsulated open, close, read, write */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+ 
+ #ifndef HAVE_GETLOADAVG
+ 
--- a/package/at/at-crosscompile.patch
+++ b/package/at/at-crosscompile.patch
@@ -1,83 +0,0 @@
-diff -rdup at-3.1.10.orig/Makefile.in at-3.1.10/Makefile.in
--- at-3.1.10.orig/Makefile.in	2007-01-22 14:35:41.000000000 +0100
-+++ at-3.1.10/Makefile.in	2007-01-22 14:41:41.000000000 +0100
-@@ -62,6 +62,8 @@ MISC =  COPYING  Makefile.in configure a
- DIST = $(CSRCS) $(HEADERS) $(MISC) $(OTHERS)
- LIST = Filelist Filelist.asc
- 
-+IROOT = $(DESTDIR)
-+
- .PHONY: all install clean dist distclean
- 
- all: at atd atrun
-@@ -78,7 +80,7 @@ atd: $(RUNOBJECTS)
- y.tab.c y.tab.h: parsetime.y
- 	$(YACC) -d parsetime.y
- 
-lex.yy.c: parsetime.l
-+lex.yy.c: parsetime.l y.tab.h
- 	$(LEX) -i parsetime.l
- 
- atrun: atrun.in
-diff -rdup at-3.1.10.orig/config.h.in at-3.1.10/config.h.in
--- at-3.1.10.orig/config.h.in	2007-01-22 14:35:41.000000000 +0100
-+++ at-3.1.10/config.h.in	2007-01-22 14:35:35.000000000 +0100
-@@ -181,3 +181,6 @@
- 
- #undef HAVE_ATTRIBUTE_NORETURN
- #undef HAVE_PAM
-+
-+#undef NEED_YYWRAP
-+
-diff -rdup at-3.1.10.orig/configure at-3.1.10/configure
--- at-3.1.10.orig/configure	2007-01-22 14:35:41.000000000 +0100
-+++ at-3.1.10/configure	2007-01-22 14:35:35.000000000 +0100
-@@ -1037,7 +1037,7 @@ esac
- echo $ac_n "checking Trying to compile a trivial ANSI C program""... $ac_c" 1>&6
- echo "configure:1039: checking Trying to compile a trivial ANSI C program" >&5
- if test "$cross_compiling" = yes; then
-  { echo "configure: error: Could not compile and run even a trivial ANSI C program - check CC." 1>&2; exit 1; }
-+  echo "$ac_t""assuming it works" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 1044 "configure"
-diff -rdup at-3.1.10.orig/getloadavg.c at-3.1.10/getloadavg.c
--- at-3.1.10.orig/getloadavg.c	2007-01-22 14:35:41.000000000 +0100
-+++ at-3.1.10/getloadavg.c	2007-01-22 14:35:35.000000000 +0100
-@@ -66,11 +66,12 @@ Boston, MA  02110-1301  USA */
- 
- /* This should always be first.  */
- #ifdef HAVE_CONFIG_H
-#include <config.h>
-+#include "config.h"
- #endif
- 
-#include "lisp.h"
-#include "sysfile.h" /* for encapsulated open, close, read, write */
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- 
- #ifndef HAVE_GETLOADAVG
- 
-diff -rdup at-3.1.10.orig/parsetime.h at-3.1.10/parsetime.h
--- at-3.1.10.orig/parsetime.h	2005-08-05 05:16:01.000000000 +0200
-+++ at-3.1.10/parsetime.h	2007-01-22 14:45:41.000000000 +0100
-@@ -17,6 +17,7 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#include "panic.h"
- time_t parsetime(int argc, char **argv);
- 
- extern char *last_token;
-diff -rdup at-3.1.10.orig/parsetime.l at-3.1.10/parsetime.l
--- at-3.1.10.orig/parsetime.l	2007-01-22 14:35:41.000000000 +0100
-+++ at-3.1.10/parsetime.l	2007-01-22 14:35:35.000000000 +0100
-@@ -1,5 +1,6 @@
- %{
- 
-+#include "config.h"
- #include <string.h>
- #include <time.h>
- #include "y.tab.h"
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -3,75 +3,39 @@
 # at
 #
 #############################################################
-AT_VERSION:=3.1.10
-AT_SOURCE:=at_$(AT_VERSION).tar.gz
-AT_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/at
-AT_DIR:=$(BUILD_DIR)/at-$(AT_VERSION)
-AT_CAT:=$(ZCAT)
-AT_TARGET_SCRIPT:=etc/init.d/S99at
-AT_BINARY:=at
+AT_VERSION = 3.1.12
+AT_SOURCE = at_$(AT_VERSION).orig.tar.gz
+AT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/at
+AT_AUTORECONF = YES
+AT_INSTALL_STAGING = NO
+AT_INSTALL_TARGET = YES
+# no install-strip / install-exec
+AT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install

-$(DL_DIR)/$(AT_SOURCE):
-	 $(call DOWNLOAD,$(AT_SITE),$(AT_SOURCE))
+AT_CONF_OPT = \
+        --with-jobdir=/var/spool/cron/atjobs \
+        --with-atspool=/var/spool/cron/atspool \
+        --with-daemon_username=root \
+        --with-daemon_groupname=root \
+	SENDMAIL=/usr/sbin/sendmail

-at-source: $(DL_DIR)/$(AT_SOURCE)
+$(eval $(call AUTOTARGETS,package,at))

-$(AT_DIR)/.unpacked: $(DL_DIR)/$(AT_SOURCE)
-	$(AT_CAT) $(DL_DIR)/$(AT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(AT_DIR) package/at/ at\*.patch
+$(AT_HOOK_POST_INSTALL): $(AT_TARGET_INSTALL_TARGET)
+	$(INSTALL) -m 0755 package/at/S99at $(TARGET_DIR)/etc/init.d/S99at
 	touch $@

-$(AT_DIR)/.configured: $(AT_DIR)/.unpacked
-	(cd $(AT_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-jobdir=/var/lib/atjobs \
-		--with-atspool=/var/lib/atspool \
-		--with-daemon_username=at \
-		--with-daemon_groupname=at \
-	)
-	touch $@
-
-$(AT_DIR)/$(AT_BINARY): $(AT_DIR)/.configured
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(AT_DIR)
-	touch $@
-
-$(TARGET_DIR)/$(AT_TARGET_SCRIPT): $(AT_DIR)/$(AT_BINARY)
-	# Use fakeroot to pretend to do 'make install' as root
-	echo '$(MAKE) DAEMON_USERNAME=root DAEMON_GROUPNAME=root ' \
-	 '$(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(AT_DIR) install' \
-		> $(PROJECT_BUILD_DIR)/.fakeroot.at
-ifneq ($(BR2_HAVE_MANPAGES),y)
-	echo 'rm -rf $(TARGET_DIR)/usr/man' >> $(PROJECT_BUILD_DIR)/.fakeroot.at
-endif
-	echo 'rm -rf $(TARGET_DIR)/usr/doc/at' >> $(PROJECT_BUILD_DIR)/.fakeroot.at
-	$(INSTALL) -m 0755 -D $(AT_DIR)/debian/rc $(TARGET_DIR)/$(AT_TARGET_SCRIPT)
-
-at: uclibc host-fakeroot $(TARGET_DIR)/$(AT_TARGET_SCRIPT)
-
-at-clean:
-	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AT_DIR) uninstall
-	rm -f $(TARGET_DIR)/$(AT_TARGET_SCRIPT) $(TARGET_DIR)/etc/init.d/S99at
-	-$(MAKE) -C $(AT_DIR) clean
-
-at-dirclean:
-	rm -rf $(AT_DIR)
-
-.PHONY: at
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_AT),y)
-TARGETS+=at
-endif
+$(AT_TARGET_UNINSTALL):
+	$(call MESSAGE,"Uninstalling")
+	rm -rf $(addprefix $(TARGET_DIR),/usr/lib/atspool \
+					 /usr/lib/atjobs \
+					 /etc/at.deny \
+					 /etc/init.d/S99at \
+					 /usr/bin/at \
+					 /usr/bin/atrm \
+					 /usr/bin/atq \
+					 /usr/sbin/atd \
+					 /usr/sbin/atrun)
+	rm -f $(addprefix $(TARGET_DIR)/usr/man/man*/, \
+		at.1 atq.1 atrm.1 batch.1 at_allow.5 at_deny.5 atd.8 atrun.8)
+	rm -f $(AT_TARGET_INSTALL_TARGET) $(AT_HOOK_POST_INSTALL)
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -28,8 +28,6 @@ ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
 		ac_cv_func_getdelim=yes ac_cv_func_mkstemp=yes \
 		utils_cv_func_mkstemp_limitations=no utils_cv_func_mkdir_trailing_slash_bug=no \
 		ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes \
-		gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes \
-		ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes \
 		jm_cv_func_gettimeofday_clobber=no gl_cv_func_working_readdir=yes \
 		jm_ac_cv_func_link_follows_symlink=no utils_cv_localtime_cache=no \
 		ac_cv_struct_st_mtim_nsec=no gl_cv_func_tzset_clobber=no \
@@ -53,52 +51,14 @@ else
 ATK_CONF_OPT += --without-x
 endif

-ATK_DEPENDENCIES = libglib2 host-pkgconfig
+ATK_DEPENDENCIES = libglib2 host-pkg-config

-$(eval $(call AUTOTARGETS,package,atk))
+HOST_ATK_DEPENDENCIES = host-libglib2 host-pkg-config

-# atk for the host
-ATK_HOST_DIR:=$(BUILD_DIR)/atk-$(ATK_VERSION)-host
-
-$(DL_DIR)/$(ATK_SOURCE):
-	$(call DOWNLOAD,$(ATK_SITE),$(ATK_SOURCE))
-
-$(STAMP_DIR)/host_atk_unpacked: $(DL_DIR)/$(ATK_SOURCE)
-	mkdir -p $(ATK_HOST_DIR)
-	$(INFLATE$(suffix $(ATK_SOURCE))) $< | \
-		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(ATK_HOST_DIR) $(TAR_OPTIONS) -
-	touch $@
-
-$(STAMP_DIR)/host_atk_configured: $(STAMP_DIR)/host_atk_unpacked $(STAMP_DIR)/host_libglib2_installed $(STAMP_DIR)/host_pkgconfig_installed
-	(cd $(ATK_HOST_DIR); rm -rf config.cache; \
-		$(HOST_CONFIGURE_OPTS) \
-		CFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
-		--prefix="$(HOST_DIR)/usr" \
-		--sysconfdir="$(HOST_DIR)/etc" \
+HOST_ATK_CONF_OPT = \
 		--enable-shared \
 		--disable-static \
-		--disable-glibtest \
-	)
-	touch $@
+		--disable-glibtest

-$(STAMP_DIR)/host_atk_compiled: $(STAMP_DIR)/host_atk_configured
-	$(HOST_MAKE_ENV) $(MAKE) -C $(ATK_HOST_DIR)
-	touch $@
-
-$(STAMP_DIR)/host_atk_installed: $(STAMP_DIR)/host_atk_compiled
-	$(HOST_MAKE_ENV) $(MAKE) -C $(ATK_HOST_DIR) install
-	touch $@
-
-host-atk: $(STAMP_DIR)/host_atk_installed
-
-host-atk-source: atk-source
-
-host-atk-clean:
-	rm -f $(addprefix $(STAMP_DIR)/host_atk_,unpacked configured compiled installed)
-	-$(MAKE) -C $(ATK_HOST_DIR) uninstall
-	-$(MAKE) -C $(ATK_HOST_DIR) clean
-
-host-atk-dirclean:
-	rm -rf $(ATK_HOST_DIR)
+$(eval $(call AUTOTARGETS,package,atk))
+$(eval $(call AUTOTARGETS,package,atk,host))
--- a/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
+++ b/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
@@ -0,0 +1,36 @@
+Patch taken upstream at
+http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=7f75858f577f11a844781764f30cd42cfe8a5669,
+with the following modifications:
+
+ * Changes to NEWS file removed to avoid conflicts
+
+ * Changes also made manually to the generated configure
+   script. Otherwise, host-autoconf is needed to compile
+   host-autoconf !
+
+Index: autoconf-2.65.old/configure
+===================================================================
+--- autoconf-2.65.old.orig/configure	2009-12-15 16:11:05.175566911 +0100
+++ autoconf-2.65.old/configure	2009-12-15 16:11:37.739562146 +0100
+@@ -2380,7 +2380,7 @@
+       ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
+       ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
+       test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
+-      && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
+      && test -z "`$as_echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
+       && test -f conftest.m4f \
+       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
+       rm -f conftest.m4f
+Index: autoconf-2.65.old/m4/m4.m4
+===================================================================
+--- autoconf-2.65.old.orig/m4/m4.m4	2009-12-15 16:11:05.207566124 +0100
+++ autoconf-2.65.old/m4/m4.m4	2009-12-15 16:11:18.595562030 +0100
+@@ -29,7 +29,7 @@
+       ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
+       ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
+       test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
+-      && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
+      && test -z "`AS_ECHO([$ac_snippet]) | $ac_path_M4 --trace=mac 2>&1`" \
+       && test -f conftest.m4f \
+       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
+       rm -f conftest.m4f],
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -3,7 +3,7 @@
 # autoconf
 #
 #############################################################
-AUTOCONF_VERSION = 2.63
+AUTOCONF_VERSION = 2.65
 AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.bz2
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf

@@ -11,55 +11,19 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff
 AUTOCONF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 endif

-AUTOCONF_CONF_ENV = EMACS="no"
+AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
+		    ac_cv_prog_gnu_m4_gnu=no

-AUTOCONF_DEPENDENCIES = uclibc microperl
+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
+
+HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool

 $(eval $(call AUTOTARGETS,package,autoconf))
-
-# autoconf for the host
-AUTOCONF_HOST_DIR:=$(BUILD_DIR)/autoconf-$(AUTOCONF_VERSION)-host
+$(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)"
-
-$(DL_DIR)/$(AUTOCONF_SOURCE):
-	$(call DOWNLOAD,$(AUTOCONF_SITE),$(AUTOCONF_SOURCE))
-
-$(STAMP_DIR)/host_autoconf_unpacked: $(DL_DIR)/$(AUTOCONF_SOURCE)
-	mkdir -p $(AUTOCONF_HOST_DIR)
-	$(INFLATE$(suffix $(AUTOCONF_SOURCE))) $< | \
-		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(AUTOCONF_HOST_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(AUTOCONF_HOST_DIR) package/autoconf/ \*.patch
-	touch $@
-
-$(STAMP_DIR)/host_autoconf_configured: $(STAMP_DIR)/host_autoconf_unpacked $(STAMP_DIR)/host_m4_installed  $(STAMP_DIR)/host_libtool_installed
-	(cd $(AUTOCONF_HOST_DIR); rm -rf config.cache; \
-		$(HOST_CONFIGURE_OPTS) \
-		CFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
-		--prefix="$(HOST_DIR)/usr" \
-		--sysconfdir="$(HOST_DIR)/etc" \
-		--disable-static \
-	)
-	touch $@
-
-$(STAMP_DIR)/host_autoconf_compiled: $(STAMP_DIR)/host_autoconf_configured
-	$(MAKE) -C $(AUTOCONF_HOST_DIR)
-	touch $@
-
-$(STAMP_DIR)/host_autoconf_installed: $(STAMP_DIR)/host_autoconf_compiled
-	$(MAKE) -C $(AUTOCONF_HOST_DIR) install
-	touch $@
-
-host-autoconf: $(STAMP_DIR)/host_autoconf_installed
-
-host-autoconf-clean:
-	rm -f $(addprefix $(STAMP_DIR)/host_autoconf_,unpacked configured compiled installed)
-	-$(MAKE) -C $(AUTOCONF_HOST_DIR) uninstall
-	-$(MAKE) -C $(AUTOCONF_HOST_DIR) clean
-
-host-autoconf-dirclean:
-	rm -rf $(AUTOCONF_HOST_DIR)
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -11,55 +11,14 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff
 AUTOMAKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 endif

-AUTOMAKE_DEPENDENCIES = uclibc autoconf microperl
+AUTOMAKE_DEPENDENCIES = autoconf microperl
+
+HOST_AUTOMAKE_DEPENDENCIES = host-autoconf

 $(eval $(call AUTOTARGETS,package,automake))
-
-# automake for the host
-AUTOMAKE_HOST_DIR:=$(BUILD_DIR)/automake-$(AUTOMAKE_VERSION)-host
+$(eval $(call AUTOTARGETS,package,automake,host))

 # variables used by other packages
 AUTOMAKE:=$(HOST_DIR)/usr/bin/automake
 ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
 ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
-
-$(DL_DIR)/$(AUTOMAKE_SOURCE):
-	$(call DOWNLOAD,$(AUTOMAKE_SITE),$(AUTOMAKE_SOURCE))
-
-$(STAMP_DIR)/host_automake_unpacked: $(DL_DIR)/$(AUTOMAKE_SOURCE)
-	mkdir -p $(AUTOMAKE_HOST_DIR)
-	$(INFLATE$(suffix $(AUTOMAKE_SOURCE))) $< | \
-		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(AUTOMAKE_HOST_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(AUTOMAKE_HOST_DIR) package/automake/ \*.patch
-	touch $@
-
-$(STAMP_DIR)/host_automake_configured: $(STAMP_DIR)/host_automake_unpacked $(STAMP_DIR)/host_autoconf_installed
-	(cd $(AUTOMAKE_HOST_DIR); rm -rf config.cache; \
-		$(HOST_CONFIGURE_OPTS) \
-		CFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
-		--prefix="$(HOST_DIR)/usr" \
-		--sysconfdir="$(HOST_DIR)/etc" \
-		--disable-static \
-	)
-	touch $@
-
-$(STAMP_DIR)/host_automake_compiled: $(STAMP_DIR)/host_automake_configured
-	$(MAKE) -C $(AUTOMAKE_HOST_DIR)
-	touch $@
-
-$(STAMP_DIR)/host_automake_installed: $(STAMP_DIR)/host_automake_compiled
-	$(MAKE) -C $(AUTOMAKE_HOST_DIR) install
-	mkdir -p $(STAGING_DIR)/usr/share/aclocal
-	touch $@
-
-host-automake: $(STAMP_DIR)/host_automake_installed
-
-host-automake-clean:
-	rm -f $(addprefix $(STAMP_DIR)/host_automake_,unpacked configured compiled installed)
-	-$(MAKE) -C $(AUTOMAKE_HOST_DIR) uninstall
-	-$(MAKE) -C $(AUTOMAKE_HOST_DIR) clean
-
-host-automake-dirclean:
-	rm -rf $(AUTOMAKE_HOST_DIR)
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -46,12 +46,6 @@ AVAHI_CONF_ENV = ac_cv_func_strtod=yes \
 		ac_cv_func_mkstemp=yes \
 		utils_cv_func_mkstemp_limitations=no \
 		utils_cv_func_mkdir_trailing_slash_bug=no \
-		ac_cv_func_memcmp_working=yes \
-		ac_cv_have_decl_malloc=yes \
-		gl_cv_func_malloc_0_nonnull=yes \
-		ac_cv_func_malloc_0_nonnull=yes \
-		ac_cv_func_calloc_0_nonnull=yes \
-		ac_cv_func_realloc_0_nonnull=yes \
 		jm_cv_func_gettimeofday_clobber=no \
 		am_cv_func_working_getline=yes \
 		gl_cv_func_working_readdir=yes \
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -36,7 +36,7 @@ ifeq ($(BR2_HAVE_MANPAGES),y)
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-man
 endif

-axel: uclibc $(TARGET_DIR)/$(AXEL_TARGET_BINARY)
+axel: $(TARGET_DIR)/$(AXEL_TARGET_BINARY)

 axel-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) uninstall
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -32,6 +32,7 @@ $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)
 $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
 	# bash_cv_have_mbstate_t=yes
 	(cd $(BASH_DIR); rm -rf config.cache; \
+		$(AUTOCONF) && \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
@@ -46,7 +47,7 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
 		bash_cv_getcwd_malloc=yes \
 		bash_cv_func_sigsetjmp=present \
 		bash_cv_printf_a_format=yes \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -72,11 +73,11 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
 	touch $@

 $(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured
-	$(MAKE1) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
+	$(MAKE1) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)

 $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
 	mkdir -p $(TARGET_DIR)/bin
-	$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) install
+	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(BASH_DIR) install
 	rm -f $(TARGET_DIR)/bin/bash*
 	mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
 	(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)
@@ -92,15 +93,15 @@ endif
 # If both bash and busybox are selected, make certain bash wins
 # the fight over who gets to own the /bin/sh symlink.
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-bash: ncurses uclibc busybox $(TARGET_DIR)/$(BASH_TARGET_BINARY)
+bash: ncurses busybox host-autoconf $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 else
-bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY)
+bash: ncurses host-autoconf $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 endif

 # If both bash and busybox are selected, the /bin/sh symlink
 # may need to be reinstated by the clean targets.
 bash-clean:
-	-$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
+	-$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(BASH_DIR) uninstall
 	rm -f $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 	-$(MAKE1) -C $(BASH_DIR) clean

--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -20,10 +20,11 @@ $(DB_DIR)/.dist: $(DL_DIR)/$(DB_SOURCE)
 	touch $@

 $(DB_DIR)/.configured: $(DB_DIR)/.dist
+	$(CONFIG_UPDATE) $(DB_DIR)/dist
 	(cd $(DB_DIR)/build_unix; rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		../dist/configure \
+		../dist/configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -89,7 +90,7 @@ berkeleydb-clean:
 berkeleydb-dirclean:
 	rm -rf $(DB_DIR)

-berkeleydb: uclibc $(TARGET_DIR)/lib/$(DB_SHARLIB)
+berkeleydb: $(TARGET_DIR)/lib/$(DB_SHARLIB)

 #############################################################
 #
--- a/package/bind/bind-susv3-legacy.patch
+++ b/package/bind/bind-susv3-legacy.patch
@@ -1,23 +1,12 @@
-diff -Nura bind-9.5.1-P1/lib/isc/unix/ifiter_ioctl.c bind-9.5.1-P1.nosusv3/lib/isc/unix/ifiter_ioctl.c
--- bind-9.5.1-P1/lib/isc/unix/ifiter_ioctl.c	2007-08-30 03:02:28.000000000 -0300
-+++ bind-9.5.1-P1.nosusv3/lib/isc/unix/ifiter_ioctl.c	2009-03-04 16:31:20.000000000 -0200
+diff -Nura bind-9.5.2-P1/lib/isc/unix/ifiter_ioctl.c bind-9.5.2-P1.nosusv3/lib/isc/unix/ifiter_ioctl.c
+--- bind-9.5.2-P1/lib/isc/unix/ifiter_ioctl.c	2009-02-15 22:53:58.000000000 -0200
+++ bind-9.5.2-P1.nosusv3/lib/isc/unix/ifiter_ioctl.c	2009-12-03 13:12:56.000000000 -0300
@@ -17,6 +17,8 @@
 
- /* $Id: ifiter_ioctl.c,v 1.58 2007/08/30 06:02:28 marka Exp $ */
+ /* $Id: ifiter_ioctl.c,v 1.58.90.3 2009/02/16 00:53:58 marka Exp $ */
 
 +#include <string.h>
 +
 /*! \file
  * \brief
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
-@@ -479,8 +481,8 @@
- 	for (i = 0; i < 16; i++) {
- 		unsigned char byte;
- 		static const char hex[] = "0123456789abcdef";
-		byte = ((index(hex, address[i * 2]) - hex) << 4) |
-		       (index(hex, address[i * 2 + 1]) - hex);
-+		byte = ((strchr(hex, address[i * 2]) - hex) << 4) |
-+			(strchr(hex, address[i * 2 + 1]) - hex);
- 		addr6.s6_addr[i] = byte;
- 	}
- 	iter->current.af = AF_INET6;
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -3,11 +3,10 @@
 # bind
 #
 #############################################################
-BIND_VERSION = 9.5.1-P3
-BIND_SOURCE = bind-$(BIND_VERSION).tar.gz
+
+BIND_VERSION = 9.5.2-P2
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_LIBTOOL_PATCH = NO
-BIND_DEPENDENCIES = uclibc
 BIND_INSTALL_STAGING = NO
 BIND_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -26,7 +26,7 @@ $(BISON_DIR)/.configured: $(BISON_DIR)/.unpacked
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		gt_cv_func_gnugettext2_libintl=yes \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -62,7 +62,7 @@ endif
 	rm -rf $(TARGET_DIR)/usr/share/doc
 	cp -a package/bison/yacc $(TARGET_DIR)/usr/bin/yacc

-bison: uclibc $(TARGET_DIR)/$(BISON_TARGET_BINARY)
+bison: $(TARGET_DIR)/$(BISON_TARGET_BINARY)

 bison-clean:
 	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) uninstall
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -14,6 +14,6 @@ BLACKBOX_INSTALL_TARGET:=YES
 BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--x-libraries=$(STAGING_DIR)/usr/lib

-BLACKBOX_DEPENDENCIES:=uclibc xserver_xorg-server
+BLACKBOX_DEPENDENCIES:=xserver_xorg-server

 $(eval $(call AUTOTARGETS,package,blackbox))
--- a/package/bmon/bmon.mk
+++ b/package/bmon/bmon.mk
@@ -7,7 +7,7 @@
 BMON_VERSION = 2.1.0
 BMON_SOURCE = bmon-$(BMON_VERSION).tar.gz
 BMON_SITE = http://distfiles.gentoo.org/distfiles
-BMON_DEPENDENCIES = ncurses uclibc
+BMON_DEPENDENCIES = ncurses
 BMON_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install

 $(eval $(call AUTOTARGETS,package,bmon))
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -29,7 +29,7 @@ $(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked
 	(cd $(BOA_WORKDIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		$(BOA_DIR)/configure \
+		$(BOA_DIR)/configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -63,7 +63,7 @@ $(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer
 	touch $(BOA_WORKDIR)/.installed

-boa: uclibc $(BOA_WORKDIR)/.installed
+boa: $(BOA_WORKDIR)/.installed

 boa-source: $(DL_DIR)/$(BOA_SOURCE)

--- a/package/bootutils/Config.in
+++ b/package/bootutils/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BOOTUTILS
 	bool "bootutils"
+	depends on BR2_LARGEFILE
 	help
 	  BootUtils is a collection of utilities to facilitate booting of
 	  Linux 2.6-based systems. The process of finding the root volume
@@ -8,3 +9,5 @@ config BR2_PACKAGE_BOOTUTILS

 	  http://bootutils.pr.linuxrulz.org/

+comment "bootutils requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
--- a/package/bootutils/bootutils.mk
+++ b/package/bootutils/bootutils.mk
@@ -3,11 +3,9 @@
 # bootutils
 #
 #############################################################
-BOOTUTILS_VERSION = 0.0.9
+BOOTUTILS_VERSION = 1.0.0
 BOOTUTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bootutils

-BOOTUTILS_CONF_ENV = ac_cv_func_malloc_0_nonnull=yes
-
 BOOTUTILS_CONF_OPT = --prefix=/ --exec-prefix=/

 BOOTUTILS_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) install
--- a/package/bridge-utils/bridge.mk
+++ b/package/bridge-utils/bridge.mk
@@ -12,7 +12,6 @@ BRIDGE_INSTALL_STAGING:=NO
 BRIDGE_INSTALL_TARGET:=YES
 BRIDGE_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install
 BRIDGE_CONF_OPT:=--with-linux-headers=$(LINUX_HEADERS_DIR)
-BRIDGE_DEPENDENCIES:=uclibc

 $(eval $(call AUTOTARGETS,package,bridge))

--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -33,7 +33,7 @@ $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY): $(BSDIFF_DIR)/$(BSDIFF_BINARY)
 	cp -dpf $(BSDIFF_DIR)/bsdiff $(TARGET_DIR)/usr/bin/.
 	cp -dpf $(BSDIFF_DIR)/bspatch $(TARGET_DIR)/usr/bin/.

-bsdiff: uclibc bzip2 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY)
+bsdiff: bzip2 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY)

 bsdiff-source: $(DL_DIR)/$(BSDIFF_SOURCE)

--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -12,7 +12,7 @@ config BR2_PACKAGE_BUSYBOX
 choice
 	prompt "BusyBox Version"
 	depends on BR2_PACKAGE_BUSYBOX
-	default BR2_BUSYBOX_VERSION_1_14_X
+	default BR2_BUSYBOX_VERSION_1_16_X
 	help
 	  Select the version of BusyBox you wish to use.

@@ -22,10 +22,18 @@ choice

 	config BR2_BUSYBOX_VERSION_1_13_X
 		bool "BusyBox 1.13.x"
-		depends on BR2_DEPRECATED || BR2_RECENT
+		depends on BR2_RECENT

 	config BR2_BUSYBOX_VERSION_1_14_X
 		bool "BusyBox 1.14.x"
+		depends on BR2_DEPRECATED
+
+	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"

 	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 		bool "daily snapshot"
@@ -36,7 +44,9 @@ config BR2_BUSYBOX_VERSION
 	string
 	default "1.12.4"	if BR2_BUSYBOX_VERSION_1_12_X
 	default "1.13.4"	if BR2_BUSYBOX_VERSION_1_13_X
-	default "1.14.2"	if BR2_BUSYBOX_VERSION_1_14_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

 config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 	bool "Run BusyBox's own full installation"
@@ -54,22 +64,23 @@ config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
 	depends on BR2_PACKAGE_BUSYBOX
-	default "target/device/x86/i386/busybox.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
+	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
 	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_14_X
+	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_15_X
+	default "package/busybox/busybox-1.16.x.config" if BR2_BUSYBOX_VERSION_1_16_X
 	help
 	  Some people may wish to use their own modified BusyBox configuration
 	  file, and will specify their config file location with this option.

 	  Most people will just use the default BusyBox configuration file.

-config BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-	bool "Hide applications that are provided by busybox"
-	depends on BR2_PACKAGE_BUSYBOX
-	default y
+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
-	  Do not show packages in menuconfig that are potentially provided
+	  Show packages in menuconfig that are potentially also provided
 	  by busybox.

 config BR2_PACKAGE_BUSYBOX_SKELETON
--- a/package/busybox/busybox-1.14.2-df.patch
+++ b/package/busybox/busybox-1.14.2-df.patch
@@ -1,134 +0,0 @@
--- busybox-1.14.2/coreutils/df.c	Sun Jul  5 22:59:28 2009
-+++ busybox-1.14.2-df/coreutils/df.c	Sun Jul  5 23:00:09 2009
-@@ -44,7 +44,6 @@
- 	FILE *mount_table;
- 	struct mntent *mount_entry;
- 	struct statfs s;
-	static const char ignored_mounts[] ALIGN1 = "rootfs\0";
- 
- 	enum {
- 		OPT_KILO  = (1 << 0),
-@@ -120,7 +119,7 @@
- 			mount_point = *argv++;
- 			if (!mount_point)
- 				break;
-			mount_entry = find_mount_point(mount_point, bb_path_mtab_file);
-+			mount_entry = find_mount_point(mount_point);
- 			if (!mount_entry) {
- 				bb_error_msg("%s: can't find mount point", mount_point);
-  set_error:
-@@ -154,8 +153,8 @@
- 						) / (blocks_used + s.f_bavail);
- 			}
- 
-			/* GNU coreutils 6.10 skip certain mounts, try to be compatible.  */
-			if (index_in_strings(device, ignored_mounts) != -1)
-+			/* GNU coreutils 6.10 skips certain mounts, try to be compatible.  */
-+			if (strcmp(device, "rootfs") == 0)
- 				continue;
- 
- #ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY
--- busybox-1.14.2/include/libbb.h	Sun Jul  5 22:59:31 2009
-+++ busybox-1.14.2-df/include/libbb.h	Sun Jul  5 23:00:09 2009
-@@ -1025,7 +1025,7 @@
- 
- #ifdef HAVE_MNTENT_H
- extern int match_fstype(const struct mntent *mt, const char *fstypes) FAST_FUNC;
-extern struct mntent *find_mount_point(const char *name, const char *table) FAST_FUNC;
-+extern struct mntent *find_mount_point(const char *name) FAST_FUNC;
- #endif
- extern void erase_mtab(const char * name) FAST_FUNC;
- extern unsigned int tty_baud_to_value(speed_t speed) FAST_FUNC;
--- busybox-1.14.2/libbb/find_mount_point.c	Sun Jul  5 22:59:24 2009
-+++ busybox-1.14.2-df/libbb/find_mount_point.c	Sun Jul  5 23:00:09 2009
-@@ -17,7 +17,7 @@
-  * Given any other file (or directory), find the mount table entry for its
-  * filesystem.
-  */
-struct mntent* FAST_FUNC find_mount_point(const char *name, const char *table)
-+struct mntent* FAST_FUNC find_mount_point(const char *name)
- {
- 	struct stat s;
- 	dev_t mountDevice;
-@@ -25,27 +25,35 @@
- 	struct mntent *mountEntry;
- 
- 	if (stat(name, &s) != 0)
-		return 0;
-+		return NULL;
- 
-	if ((s.st_mode & S_IFMT) == S_IFBLK)
-+	if (S_ISBLK(s.st_mode))
- 		mountDevice = s.st_rdev;
- 	else
- 		mountDevice = s.st_dev;
- 
- 
-	mountTable = setmntent(table ? table : bb_path_mtab_file, "r");
-+	mountTable = setmntent(bb_path_mtab_file, "r");
- 	if (!mountTable)
- 		return 0;
- 
-	while ((mountEntry = getmntent(mountTable)) != 0) {
-+	while ((mountEntry = getmntent(mountTable)) != NULL) {
-+		/* rootfs mount in Linux 2.6 exists always,
-+		 * and it makes sense to always ignore it.
-+		 * Otherwise people can't reference their "real" root! */
-+		if (strcmp(mountEntry->mnt_fsname, "rootfs") == 0)
-+			continue;
-+
- 		if (strcmp(name, mountEntry->mnt_dir) == 0
- 		 || strcmp(name, mountEntry->mnt_fsname) == 0
- 		) { /* String match. */
- 			break;
- 		}
-		if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice)	/* Match the device. */
-+		/* Match the device. */
-+		if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice)
- 			break;
-		if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice)	/* Match the directory's mount point. */
-+		/* Match the directory's mount point. */
-+		if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice)
- 			break;
- 	}
- 	endmntent(mountTable);
--- busybox-1.14.2/util-linux/mkfs_minix.c	Sun Jul  5 22:59:30 2009
-+++ busybox-1.14.2-df/util-linux/mkfs_minix.c	Sun Jul  5 23:00:09 2009
-@@ -624,7 +624,6 @@
- int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
- {
-	struct mntent *mp;
- 	unsigned opt;
- 	char *tmp;
- 	struct stat statbuf;
-@@ -683,11 +682,8 @@
- 		G.total_blocks = 65535;
- 
- 	/* Check if it is mounted */
-	mp = find_mount_point(G.device_name, NULL);
-	if (mp && strcmp(G.device_name, mp->mnt_fsname) == 0)
-		bb_error_msg_and_die("%s is mounted on %s; "
-				"refusing to make a filesystem",
-				G.device_name, mp->mnt_dir);
-+	if (find_mount_point(G.device_name))
-+		bb_error_msg_and_die("can't format mounted filesystem");
- 
- 	xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
- 	if (fstat(dev_fd, &statbuf) < 0)
--- busybox-1.14.2/util-linux/mkfs_vfat.c	Sun Jul  5 22:59:30 2009
-+++ busybox-1.14.2-df/util-linux/mkfs_vfat.c	Sun Jul  5 23:00:35 2009
-@@ -273,10 +273,10 @@
- 			device_num == 0x0d00 || // xd
- 			device_num == 0x1600 )  // hdc, hdd
- 		)
-			bb_error_msg_and_die("Will not try to make filesystem on full-disk device (use -I if wanted)");
-+			bb_error_msg_and_die("will not try to make filesystem on full-disk device (use -I if wanted)");
- 		// can't work on mounted filesystems
-		if (find_mount_point(device_name, NULL))
-			bb_error_msg_and_die("Can't format mounted filesystem");
-+		if (find_mount_point(device_name))
-+			bb_error_msg_and_die("can't format mounted filesystem");
- #endif
- 		// get true sector size
- 		// (parameter must be int*, not long* or size_t*)
--- a/package/busybox/busybox-1.14.2-ls.patch
+++ b/package/busybox/busybox-1.14.2-ls.patch
@@ -1,152 +0,0 @@
-diff -urpN busybox-1.14.2/coreutils/ls.c busybox-1.14.2-ls/coreutils/ls.c
--- busybox-1.14.2/coreutils/ls.c	2009-06-22 00:40:29.000000000 +0200
-+++ busybox-1.14.2-ls/coreutils/ls.c	2009-07-03 12:46:16.000000000 +0200
-@@ -144,8 +144,7 @@ static const char ls_options[] ALIGN1 =
- 	USE_FEATURE_LS_FOLLOWLINKS("L")   /* 1, 24 */
- 	USE_FEATURE_LS_RECURSIVE("R")     /* 1, 25 */
- 	USE_FEATURE_HUMAN_READABLE("h")   /* 1, 26 */
-	USE_SELINUX("K") /* 1, 27 */
-	USE_SELINUX("Z") /* 1, 28 */
-+	USE_SELINUX("KZ") /* 2, 28 */
- 	USE_FEATURE_AUTOWIDTH("T:w:") /* 2, 30 */
- 	;
- enum {
-@@ -162,6 +161,16 @@ enum {
- 	OPT_Q = (1 << 10),
- 	//OPT_A = (1 << 11),
- 	//OPT_k = (1 << 12),
-+	OPTBIT_color = 13
-+		+ 4 * ENABLE_FEATURE_LS_TIMESTAMPS
-+		+ 4 * ENABLE_FEATURE_LS_SORTFILES
-+		+ 2 * ENABLE_FEATURE_LS_FILETYPES
-+		+ 1 * ENABLE_FEATURE_LS_FOLLOWLINKS
-+		+ 1 * ENABLE_FEATURE_LS_RECURSIVE
-+		+ 1 * ENABLE_FEATURE_HUMAN_READABLE
-+		+ 2 * ENABLE_SELINUX
-+		+ 2 * ENABLE_FEATURE_AUTOWIDTH,
-+	OPT_color = 1 << OPTBIT_color,
- };
- 
- enum {
-@@ -889,16 +898,6 @@ static int list_single(const struct dnod
- }
- 
- 
-/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
-#if ENABLE_FEATURE_LS_COLOR
-/* long option entry used only for --color, which has no short option
- * equivalent */
-static const char ls_color_opt[] ALIGN1 =
-	"color\0" Optional_argument "\xff" /* no short equivalent */
-	;
-#endif
-
-
- int ls_main(int argc UNUSED_PARAM, char **argv)
- {
- 	struct dnode **dnd;
-@@ -911,8 +910,25 @@ int ls_main(int argc UNUSED_PARAM, char 
- 	int dnfiles;
- 	int dndirs;
- 	int i;
-+#if ENABLE_FEATURE_LS_COLOR
-+	/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
-+	/* coreutils 6.10:
-+	 * # ls --color=BOGUS
-+	 * ls: invalid argument 'BOGUS' for '--color'
-+	 * Valid arguments are:
-+	 * 'always', 'yes', 'force'
-+	 * 'never', 'no', 'none'
-+	 * 'auto', 'tty', 'if-tty'
-+	 * (and substrings: "--color=alwa" work too)
-+	 */
-+	static const char ls_longopts[] ALIGN1 =
-+		"color\0" Optional_argument "\xff"; /* no short equivalent */
-+	static const char color_str[] ALIGN1 =
-+		"always\0""yes\0""force\0"
-+		"auto\0""tty\0""if-tty\0";
- 	/* need to initialize since --color has _an optional_ argument */
-	USE_FEATURE_LS_COLOR(const char *color_opt = "always";)
-+	const char *color_opt = color_str; /* "always" */
-+#endif
- 
- 	INIT_G();
- 
-@@ -927,7 +943,7 @@ int ls_main(int argc UNUSED_PARAM, char 
- #endif
- 
- 	/* process options */
-	USE_FEATURE_LS_COLOR(applet_long_options = ls_color_opt;)
-+	USE_FEATURE_LS_COLOR(applet_long_options = ls_longopts;)
- #if ENABLE_FEATURE_AUTOWIDTH
- 	opt_complementary = "T+:w+"; /* -T N, -w N */
- 	opt = getopt32(argv, ls_options, &tabstops, &terminal_width
-@@ -966,13 +982,20 @@ int ls_main(int argc UNUSED_PARAM, char 
- 		if (!p || (p[0] && strcmp(p, "none") != 0))
- 			show_color = 1;
- 	}
-	if (opt & (1 << i)) {  /* next flag after short options */
-		if (strcmp("always", color_opt) == 0)
-			show_color = 1;
-		else if (strcmp("never", color_opt) == 0)
-+	if (opt & OPT_color) {
-+		if (color_opt[0] == 'n')
- 			show_color = 0;
-		else if (strcmp("auto", color_opt) == 0 && isatty(STDOUT_FILENO))
-			show_color = 1;
-+		else switch (index_in_substrings(color_str, color_opt)) {
-+		case 3:
-+		case 4:
-+		case 5:
-+			if (isatty(STDOUT_FILENO)) {
-+		case 0:
-+		case 1:
-+		case 2:
-+				show_color = 1;
-+			}
-+		}
- 	}
- #endif
- 
-diff -urpN busybox-1.14.2/testsuite/ls/ls-1-works busybox-1.14.2-ls/testsuite/ls/ls-1-works
--- busybox-1.14.2/testsuite/ls/ls-1-works	2009-06-22 00:32:00.000000000 +0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-1-works	2009-07-02 14:28:45.000000000 +0200
-@@ -1,4 +1,4 @@
- [ -n "$d" ] || d=..
-ls -1 "$d" > logfile.gnu
-busybox ls -1 "$d" > logfile.bb
-cmp logfile.gnu logfile.bb
-+LC_ALL=C ls -1 "$d" > logfile.gnu
-+LC_ALL=C busybox ls -1 "$d" > logfile.bb
-+diff -ubw logfile.gnu logfile.bb
-diff -urpN busybox-1.14.2/testsuite/ls/ls-h-works busybox-1.14.2-ls/testsuite/ls/ls-h-works
--- busybox-1.14.2/testsuite/ls/ls-h-works	2009-06-22 00:32:00.000000000 +0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-h-works	2009-07-02 14:28:45.000000000 +0200
-@@ -1,4 +1,4 @@
- [ -n "$d" ] || d=..
-ls -h "$d" > logfile.gnu
-busybox ls -h "$d" > logfile.bb
-cmp logfile.gnu logfile.bb
-+LC_ALL=C ls -h "$d" > logfile.gnu
-+LC_ALL=C busybox ls -h "$d" > logfile.bb
-+diff -ubw logfile.gnu logfile.bb
-diff -urpN busybox-1.14.2/testsuite/ls/ls-l-works busybox-1.14.2-ls/testsuite/ls/ls-l-works
--- busybox-1.14.2/testsuite/ls/ls-l-works	2009-06-22 00:32:00.000000000 +0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-l-works	2009-07-02 14:28:45.000000000 +0200
-@@ -1,4 +1,4 @@
- [ -n "$d" ] || d=..
- LC_ALL=C ls -l "$d" > logfile.gnu
-busybox ls -l "$d" > logfile.bb
-diff -w logfile.gnu logfile.bb
-+LC_ALL=C busybox ls -l "$d" > logfile.bb
-+diff -ubw logfile.gnu logfile.bb
-diff -urpN busybox-1.14.2/testsuite/ls/ls-s-works busybox-1.14.2-ls/testsuite/ls/ls-s-works
--- busybox-1.14.2/testsuite/ls/ls-s-works	2009-06-22 00:32:00.000000000 +0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-s-works	2009-07-02 14:28:45.000000000 +0200
-@@ -1,4 +1,4 @@
- [ -n "$d" ] || d=..
- LC_ALL=C ls -1s "$d" > logfile.gnu
-busybox ls -1s "$d" > logfile.bb
-cmp logfile.gnu logfile.bb
-+LC_ALL=C busybox ls -1s "$d" > logfile.bb
-+diff -ubw logfile.gnu logfile.bb
--- a/package/busybox/busybox-1.14.2-test.patch
+++ b/package/busybox/busybox-1.14.2-test.patch
@@ -1,64 +0,0 @@
-diff -urpN busybox-1.14.2/coreutils/test.c busybox-1.14.2-test/coreutils/test.c
--- busybox-1.14.2/coreutils/test.c	2009-07-05 22:59:28.000000000 +0200
-+++ busybox-1.14.2-test/coreutils/test.c	2009-07-17 01:46:28.000000000 +0200
-@@ -571,7 +571,14 @@ static number_t nexpr(enum token n)
- 
- 	nest_msg(">nexpr(%s)\n", TOKSTR[n]);
- 	if (n == UNOT) {
-		res = !nexpr(check_operator(*++args));
-+		n = check_operator(*++args);
-+		if (n == EOI) {
-+			/* special case: [ ! ], [ a -a ! ] are valid */
-+			/* IOW, "! ARG" may miss ARG */
-+			unnest_msg("<nexpr:1 (!EOI)\n");
-+			return 1;
-+		}
-+		res = !nexpr(n);
- 		unnest_msg("<nexpr:%lld\n", res);
- 		return res;
- 	}
-@@ -742,7 +749,7 @@ int test_main(int argc, char **argv)
- 		check_operator(argv[1]);
- 		if (last_operator->op_type == BINOP) {
- 			/* "test [!] arg1 <binary_op> arg2" */
-			args = &argv[0];
-+			args = argv;
- 			res = (binop() == 0);
- 			goto ret;
- 		}
-@@ -755,7 +762,7 @@ int test_main(int argc, char **argv)
- 		argv--;
- 	}
- #endif
-	args = &argv[0];
-+	args = argv;
- 	res = !oexpr(check_operator(*args));
- 
- 	if (*args != NULL && *++args != NULL) {
-diff -urpN busybox-1.14.2/testsuite/test.tests busybox-1.14.2-test/testsuite/test.tests
--- busybox-1.14.2/testsuite/test.tests	2009-07-05 22:59:22.000000000 +0200
-+++ busybox-1.14.2-test/testsuite/test.tests	2009-07-17 01:46:28.000000000 +0200
-@@ -21,6 +21,11 @@ testing "test '': should be false (1)" \
- 	"1\n" \
- 	"" ""
- 
-+testing "test !: should be true (0)" \
-+	"busybox test !; echo \$?" \
-+	"0\n" \
-+	"" ""
-+
- testing "test a: should be true (0)" \
- 	"busybox test a; echo \$?" \
- 	"0\n" \
-@@ -51,6 +56,11 @@ testing "test -lt = -gt: should be false
- 	"1\n" \
- 	"" ""
- 
-+testing "test a -a !: should be true (0)" \
-+	"busybox test a -a !; echo \$?" \
-+	"0\n" \
-+	"" ""
-+
- testing "test -f = a -o b: should be true (0)" \
- 	"busybox test -f = a -o b; echo \$?" \
- 	"0\n" \
--- a/package/busybox/busybox-1.14.2-udhcpd.patch
+++ b/package/busybox/busybox-1.14.2-udhcpd.patch
@@ -1,12 +0,0 @@
-diff -urpN busybox-1.14.2/networking/udhcp/files.c busybox-1.14.2-udhcpd/networking/udhcp/files.c
--- busybox-1.14.2/networking/udhcp/files.c	2009-06-22 00:40:29.000000000 +0200
-+++ busybox-1.14.2-udhcpd/networking/udhcp/files.c	2009-07-07 14:58:39.000000000 +0200
-@@ -420,7 +420,7 @@ void FAST_FUNC read_leases(const char *f
- 				continue;
- 			/* NB: add_lease takes "relative time", IOW,
- 			 * lease duration, not lease deadline. */
-			if (!(add_lease(lease.chaddr, lease.yiaddr, expires, lease.hostname))) {
-+			if (!(add_lease(lease.chaddr, lease.yiaddr, expires, NULL /* was lease.hostname. bug in add_lease, disabled */ ))) {
- 				bb_error_msg("too many leases while loading %s", file);
- 				break;
- 			}
--- a/package/busybox/busybox-1.16.x.config
+++ b/package/busybox/busybox-1.16.x.config
@@ -0,0 +1,920 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.16.0
+# Sun Jan 31 20:49:46 2010
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# 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
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_LOCALE_SUPPORT is not set
+# CONFIG_FEATURE_ASSUME_UNICODE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+CONFIG_FEATURE_CLEAN_UP=y
+# CONFIG_FEATURE_PIDFILE is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_HAVE_RPC is not set
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+# CONFIG_LFS is not set
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=999
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
+# CONFIG_FEATURE_SEAMLESS_GZ is not set
+# CONFIG_FEATURE_SEAMLESS_Z is not set
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+# CONFIG_LZOP is not set
+# CONFIG_LZOP_COMPR_HIGH is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+# CONFIG_FEATURE_TAR_AUTODETECT is not set
+CONFIG_FEATURE_TAR_FROM=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
+# CONFIG_UNCOMPRESS is not set
+CONFIG_UNLZMA=y
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
+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 is not set
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_FANCY is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+# CONFIG_FSYNC is not set
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+# CONFIG_SHOWKEY is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_CMP=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+# CONFIG_FEATURE_FIND_LINKS is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+# CONFIG_USE_BB_CRYPT_SHA is not set
+CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+CONFIG_DELGROUP=y
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
+
+#
+# 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
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
+# CONFIG_BLKID is not set
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+# CONFIG_FDISK is not set
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+# CONFIG_FEATURE_FDISK_WRITABLE is not set
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_EXT2 is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_REISER is not set
+# CONFIG_MKFS_VFAT is not set
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+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 is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+CONFIG_FEATURE_MDEV_EXEC=y
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_UUID is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+# CONFIG_VOLUMEID is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_RDEV is not set
+CONFIG_READPROFILE=y
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+# CONFIG_FEATURE_SWAPON_PRI is not set
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+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_IONICE is not set
+# CONFIG_INOTIFYD is not set
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+CONFIG_RUNLEVEL=y
+# CONFIG_RX is not set
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TIMEOUT is not set
+# CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+CONFIG_ARPING=y
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+# CONFIG_IFPLUGD is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+# CONFIG_FEATURE_NETSTAT_PRG is not set
+CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_TFTP_DEBUG is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_TRACEROUTE6 is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE=""
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+# CONFIG_TCPSVD is not set
+# CONFIG_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDPSVD is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+# CONFIG_NMETER is not set
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+CONFIG_SH_MATH_SUPPORT=y
+# CONFIG_SH_MATH_SUPPORT_64 is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_CTTYHACK is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -7,29 +7,28 @@

 ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
 # Be aware that this changes daily....
-BUSYBOX_DIR:=$(PROJECT_BUILD_DIR)/busybox
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox
 BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
 BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
 else
-BUSYBOX_VERSION=$(strip $(subst ",, $(BR2_BUSYBOX_VERSION)))
-#"))
-BUSYBOX_DIR:=$(PROJECT_BUILD_DIR)/busybox-$(BUSYBOX_VERSION)
+BUSYBOX_VERSION=$(call qstrip,$(BR2_BUSYBOX_VERSION))
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VERSION)
 BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VERSION).tar.bz2
 BUSYBOX_SITE:=http://www.busybox.net/downloads
 endif

 BUSYBOX_UNZIP=$(BZCAT)
+BUSYBOX_CFLAGS=$(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include

 ifndef BUSYBOX_CONFIG_FILE
-BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
-#")
+BUSYBOX_CONFIG_FILE=$(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
 endif

 $(DL_DIR)/$(BUSYBOX_SOURCE):
 	$(call DOWNLOAD,$(BUSYBOX_SITE),$(BUSYBOX_SOURCE))

 $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
-	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -
+	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
 	# if we have external syslogd, force busybox to use it
 	$(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c
@@ -69,8 +68,10 @@ else
 endif
 ifeq ($(BR2_INET_IPV6),y)
 	$(SED) "s/^.*CONFIG_FEATURE_IPV6.*/CONFIG_FEATURE_IPV6=y/;" $(BUSYBOX_DIR)/.config
+	$(SED) "s/^.*CONFIG_FEATURE_IFUPDOWN_IPV6.*/CONFIG_FEATURE_IFUPDOWN_IPV6=y/;" $(BUSYBOX_DIR)/.config
 else
 	$(SED) "s/^.*CONFIG_FEATURE_IPV6.*/CONFIG_FEATURE_IPV6=n/;" $(BUSYBOX_DIR)/.config
+	$(SED) "s/^.*CONFIG_FEATURE_IFUPDOWN_IPV6.*/CONFIG_FEATURE_IFUPDOWN_IPV6=n/;" $(BUSYBOX_DIR)/.config
 endif
 ifeq ($(BR2_INET_RPC),y)
 	$(SED) "s/^.*CONFIG_FEATURE_MOUNT_NFS.*/CONFIG_FEATURE_MOUNT_NFS=y/;" $(BUSYBOX_DIR)/.config
@@ -100,13 +101,13 @@ $(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="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)
+		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="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) \
+		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) \
 		-f scripts/Makefile.IMA
 endif

@@ -115,22 +116,22 @@ 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="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
+		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) install
 else
 	install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
 endif
 	# Just in case
 	-chmod a+x $(TARGET_DIR)/usr/share/udhcpc/default.script

-busybox: uclibc $(TARGET_DIR)/bin/busybox
+busybox: $(TARGET_DIR)/bin/busybox

 busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE)

-busybox-unpacked: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.unpacked
+busybox-unpacked: host-sed $(BUILD_DIR) $(BUSYBOX_DIR)/.unpacked

-busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.config
+busybox-config: host-sed $(BUILD_DIR) $(BUSYBOX_DIR)/.config

-busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.config
+busybox-menuconfig: host-sed $(BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.config
 	$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig

 busybox-update:
--- a/package/busybox/initramfs.mk
+++ b/package/busybox/initramfs.mk
@@ -6,7 +6,7 @@
 ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)

 BUSYBOX_INITRAMFS_DIR:=$(BUSYBOX_DIR)-initramfs
-BR2_INITRAMFS_DIR:=$(PROJECT_BUILD_DIR)/initramfs
+BR2_INITRAMFS_DIR:=$(BUILD_DIR)/initramfs
 BB_INITRAMFS_TARGET:=$(IMAGE).initramfs_lst

 $(BUSYBOX_INITRAMFS_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
@@ -105,39 +105,39 @@ $(BR2_INITRAMFS_DIR)/bin/busybox: $(BUSYBOX_INITRAMFS_DIR)/busybox


 $(BB_INITRAMFS_TARGET): host-fakeroot $(BR2_INITRAMFS_DIR)/bin/busybox
-	ln -fs bin/busybox $(PROJECT_BUILD_DIR)/initramfs/init
-	mkdir -p $(PROJECT_BUILD_DIR)/initramfs/etc
+	ln -fs bin/busybox $(BUILD_DIR)/initramfs/init
+	mkdir -p $(BUILD_DIR)/initramfs/etc
 	cat target/generic/target_busybox_skeleton/etc/inittab > \
-		$(PROJECT_BUILD_DIR)/initramfs/etc/inittab
-	rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	(echo "chown -R 0:0 $(PROJECT_BUILD_DIR)/initramfs"; \
-	 echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(PROJECT_BUILD_DIR)/initramfs"; \
-	 echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(PROJECT_BUILD_DIR)/initramfs > $(BB_INITRAMFS_TARGET)"; \
-	) > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	chmod +x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+		$(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 -- \
-		$(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+		$(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+	rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
 	touch -c $@

-$(PROJECT_BUILD_DIR)/.initramfs_done: $(BR2_INITRAMFS_DIR)/bin/busybox \
+$(BUILD_DIR)/.initramfs_done: $(BR2_INITRAMFS_DIR)/bin/busybox \
 					$(BB_INITRAMFS_TARGET)
 	touch $@

 busybox-initramfs-source:
-busybox-initramfs: uclibc $(PROJECT_BUILD_DIR)/.initramfs_done
+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 $(PROJECT_BUILD_DIR)/.initramfs_*
+	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) \
-		$(PROJECT_BUILD_DIR)/.initramfs_*
+		$(BUILD_DIR)/.initramfs_*
 endif
 #############################################################
 #
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -96,7 +96,7 @@ $(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/usr/lib/libbz2.a

 bzip2-headers: $(TARGET_DIR)/usr/lib/libbz2.a

-bzip2: uclibc $(BZIP2_TARGET_BINARY)
+bzip2: $(BZIP2_TARGET_BINARY)

 bzip2-clean:
 	rm -f $(addprefix $(TARGET_DIR),/lib/libbz2.* \
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -26,10 +26,7 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
 		ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
 		ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
-		utils_cv_func_mkdir_trailing_slash_bug=no ac_cv_func_memcmp_working=yes \
-		ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \
-		ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \
-		ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \
+		utils_cv_func_mkdir_trailing_slash_bug=no jm_cv_func_gettimeofday_clobber=no \
 		gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
 		utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
 		gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
@@ -39,7 +36,7 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no gl_cv_c_restrict=no

-CAIRO_DEPENDENCIES = uclibc host-pkgconfig fontconfig pixman
+CAIRO_DEPENDENCIES = host-pkg-config fontconfig pixman

 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
 	CAIRO_CONF_OPT += --enable-directfb
@@ -82,53 +79,15 @@ else
 	CAIRO_CONF_OPT += --disable-svg
 endif

-$(eval $(call AUTOTARGETS,package,cairo))
+HOST_CAIRO_DEPENDENCIES = host-pkg-config host-pixman host-fontconfig

-# cairo for the host
-CAIRO_HOST_DIR:=$(BUILD_DIR)/cairo-$(CAIRO_VERSION)-host
-
-$(DL_DIR)/$(CAIRO_SOURCE):
-	$(call DOWNLOAD,$(CAIRO_SITE),$(CAIRO_SOURCE))
-
-$(STAMP_DIR)/host_cairo_unpacked: $(DL_DIR)/$(CAIRO_SOURCE)
-	mkdir -p $(CAIRO_HOST_DIR)
-	$(INFLATE$(suffix $(CAIRO_SOURCE))) $< | \
-		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(CAIRO_HOST_DIR) $(TAR_OPTIONS) -
-	touch $@
-
-$(STAMP_DIR)/host_cairo_configured: $(STAMP_DIR)/host_cairo_unpacked $(STAMP_DIR)/host_pkgconfig_installed $(STAMP_DIR)/host_fontconfig_installed $(STAMP_DIR)/host_pixman_installed
-	(cd $(CAIRO_HOST_DIR); rm -rf config.cache; \
-		$(HOST_CONFIGURE_OPTS) \
-		CFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
-		--prefix="$(HOST_DIR)/usr" \
-		--sysconfdir="$(HOST_DIR)/etc" \
+HOST_CAIRO_CONF_OPT = \
 		--enable-ps \
 		--enable-pdf \
 		--enable-xlib \
 		--with-x \
 		--disable-png \
-		--disable-svg \
-	)
-	touch $@
+		--disable-svg

-$(STAMP_DIR)/host_cairo_compiled: $(STAMP_DIR)/host_cairo_configured
-	$(HOST_MAKE_ENV) $(MAKE) -C $(CAIRO_HOST_DIR)
-	touch $@
-
-$(STAMP_DIR)/host_cairo_installed: $(STAMP_DIR)/host_cairo_compiled
-	$(HOST_MAKE_ENV) $(MAKE) -C $(CAIRO_HOST_DIR) install
-	touch $@
-
-host-cairo: $(STAMP_DIR)/host_cairo_installed
-
-host-cairo-source: cairo-source
-
-host-cairo-clean:
-	rm -f $(addprefix $(STAMP_DIR)/host_cairo_,unpacked configured compiled installed)
-	-$(MAKE) -C $(CAIRO_HOST_DIR) uninstall
-	-$(MAKE) -C $(CAIRO_HOST_DIR) clean
-
-host-cairo-dirclean:
-	rm -rf $(CAIRO_HOST_DIR)
+$(eval $(call AUTOTARGETS,package,cairo))
+$(eval $(call AUTOTARGETS,package,cairo,host))
--- a/package/config/conf.c
+++ b/package/config/conf.c
@@ -611,6 +611,10 @@ int main(int ac, char **av)
 			fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n"));
 			exit(1);
 		}
+		if (conf_write_autoconf()) {
+			fprintf(stderr, _("\n*** Error during update of the Buildroot configuration.\n\n"));
+			return 1;
+		}
 	}
 	return 0;
 }
--- a/package/config/confdata.c
+++ b/package/config/confdata.c
@@ -44,9 +44,7 @@ const char *conf_get_configname(void)

 const char *conf_get_autoconfig_name(void)
 {
-	char *name = getenv("BUILDROOT_AUTOCONFIG");
-
-	return name ? name : "$(BR2_DEPENDS_DIR)/config/auto.conf";
+	return getenv("KCONFIG_AUTOCONFIG");
 }

 static char *conf_expand_value(const char *in)
--- a/package/config/kconfig-to-buildroot2.patch
+++ b/package/config/kconfig-to-buildroot2.patch
@@ -1,7 +1,7 @@
 ---
 Makefile            |    7 +++
 README.buildroot2   |   22 ++++++++++
- conf.c              |   13 ++----
+ conf.c              |   17 ++++----
 confdata.c          |  101 ++++++++++++++++++++++++++------------------------
 expr.c              |   42 ++++++++++----------
 gconf.c             |    4 -
@@ -11,7 +11,7 @@
 util.c              |  105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 zconf.tab.c_shipped |    2 
 zconf.y             |    2 
- 12 files changed, 241 insertions(+), 103 deletions(-)
+ 12 files changed, 244 insertions(+), 104 deletions(-)

 Index: config/Makefile
 ===================================================================
@@ -91,7 +91,7 @@ Index: config/conf.c
 				return 1;
 			}
 		}
-@@ -600,16 +599,16 @@
+@@ -600,18 +599,22 @@
 		 * All other commands are only used to generate a config.
 		 */
 		if (conf_get_changed() && conf_write(NULL)) {
@@ -110,7 +110,13 @@ Index: config/conf.c
 +			fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n"));
 			exit(1);
 		}
+		if (conf_write_autoconf()) {
+			fprintf(stderr, _("\n*** Error during update of the Buildroot configuration.\n\n"));
+			return 1;
+		}
 	}
+ 	return 0;
+ }
 Index: config/confdata.c
 ===================================================================
 --- config.orig/confdata.c
@@ -132,7 +138,7 @@ Index: config/confdata.c
 
 static void conf_warning(const char *fmt, ...)
 {
-@@ -36,16 +37,16 @@
+@@ -36,16 +37,14 @@
 
 const char *conf_get_configname(void)
 {
@@ -145,14 +151,13 @@ Index: config/confdata.c
 const char *conf_get_autoconfig_name(void)
 {
 -	char *name = getenv("KCONFIG_AUTOCONFIG");
-+	char *name = getenv("BUILDROOT_AUTOCONFIG");
- 
+-
 -	return name ? name : "include/config/auto.conf";
-+	return name ? name : "$(BR2_DEPENDS_DIR)/config/auto.conf";
+	return getenv("KCONFIG_AUTOCONFIG");
 }
 
 static char *conf_expand_value(const char *in)
-@@ -219,22 +220,22 @@
+@@ -219,22 +218,22 @@
 		sym = NULL;
 		switch (line[0]) {
 		case '#':
@@ -179,7 +184,7 @@ Index: config/confdata.c
 				if (sym->type == S_UNKNOWN)
 					sym->type = S_BOOLEAN;
 			}
-@@ -251,12 +252,8 @@
+@@ -251,12 +250,8 @@
 				;
 			}
 			break;
@@ -194,7 +199,7 @@ Index: config/confdata.c
 			if (!p)
 				continue;
 			*p++ = 0;
-@@ -267,13 +264,13 @@
+@@ -267,13 +262,13 @@
 					*p2 = 0;
 			}
 			if (def == S_DEF_USER) {
@@ -210,7 +215,7 @@ Index: config/confdata.c
 				if (sym->type == S_UNKNOWN)
 					sym->type = S_OTHER;
 			}
-@@ -443,7 +440,7 @@
+@@ -443,7 +438,7 @@
 	if (!out)
 		return 1;
 
@@ -219,7 +224,7 @@ Index: config/confdata.c
 	sym_calc_value(sym);
 	time(&now);
 	env = getenv("KCONFIG_NOTIMESTAMP");
-@@ -452,10 +449,8 @@
+@@ -452,10 +447,8 @@
 
 	fprintf(out, _("#\n"
 		       "# Automatically generated make config: don't edit\n"
@@ -230,7 +235,7 @@ Index: config/confdata.c
 		     use_timestamp ? "# " : "",
 		     use_timestamp ? ctime(&now) : "");
 
-@@ -489,19 +484,19 @@
+@@ -489,19 +482,19 @@
 			case S_TRISTATE:
 				switch (sym_get_tristate_value(sym)) {
 				case no:
@@ -254,7 +259,7 @@ Index: config/confdata.c
 				while (1) {
 					l = strcspn(str, "\"\\");
 					if (l) {
-@@ -517,12 +512,12 @@
+@@ -517,12 +510,12 @@
 			case S_HEX:
 				str = sym_get_string_value(sym);
 				if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
@@ -269,7 +274,7 @@ Index: config/confdata.c
 				break;
 			}
 		}
-@@ -564,6 +559,7 @@
+@@ -564,6 +557,7 @@
 {
 	const char *name;
 	char path[128];
@@ -277,7 +282,7 @@ Index: config/confdata.c
 	char *s, *d, c;
 	struct symbol *sym;
 	struct stat sb;
-@@ -572,8 +568,20 @@
+@@ -572,8 +566,20 @@
 	name = conf_get_autoconfig_name();
 	conf_read_simple(name, S_DEF_AUTO);
 
@@ -299,7 +304,7 @@ Index: config/confdata.c
 
 	res = 0;
 	for_all_symbols(i, sym) {
-@@ -666,9 +674,11 @@
+@@ -666,9 +672,11 @@
 		close(fd);
 	}
 out:
@@ -314,7 +319,7 @@ Index: config/confdata.c
 	return res;
 }
 
-@@ -683,7 +693,7 @@
+@@ -683,7 +691,7 @@
 
 	sym_clear_all_valid();
 
@@ -323,7 +328,7 @@ Index: config/confdata.c
 
 	if (conf_split_config())
 		return 1;
-@@ -698,22 +708,19 @@
+@@ -698,22 +706,19 @@
 		return 1;
 	}
 
@@ -350,7 +355,7 @@ Index: config/confdata.c
 
 	for_all_symbols(i, sym) {
 		sym_calc_value(sym);
-@@ -726,19 +733,19 @@
+@@ -726,19 +731,19 @@
 			case no:
 				break;
 			case mod:
@@ -376,7 +381,7 @@ Index: config/confdata.c
 			while (1) {
 				l = strcspn(str, "\"\\");
 				if (l) {
-@@ -758,14 +765,14 @@
+@@ -758,14 +763,14 @@
 		case S_HEX:
 			str = sym_get_string_value(sym);
 			if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
--- a/package/coreutils/coreutils-7.4-rename-m4-fix.patch
+++ b/package/coreutils/coreutils-7.4-rename-m4-fix.patch
@@ -23,3 +23,22 @@ Index: coreutils-7.4/m4/rename.m4
       AC_DEFINE([RENAME_DEST_EXISTS_BUG], [1],
 	[Define if rename does not work when the destination file exists,
 	 as on Windows.])
+Index: coreutils-7.4/configure
+===================================================================
+--- coreutils-7.4.orig/configure
+++ coreutils-7.4/configure
+@@ -28698,12 +28698,12 @@ $as_echo "$gl_cv_func_rename_dest_exists
+ 
+ $as_echo "#define rename rpl_rename" >>confdefs.h
+ 
+-    if test $gl_cv_func_rename_trailing_slash_bug; then
+    if test $gl_cv_func_rename_trailing_slash_bug = yes; then
+ 
+ $as_echo "#define RENAME_TRAILING_SLASH_BUG 1" >>confdefs.h
+ 
+     fi
+-    if test $gl_cv_func_rename_dest_exists_bug; then
+    if test $gl_cv_func_rename_dest_exists_bug = yes; then
+ 
+ $as_echo "#define RENAME_DEST_EXISTS_BUG 1" >>confdefs.h
+ 
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -23,6 +23,9 @@ $(COREUTILS_DIR)/.unpacked: $(DL_DIR)/$(COREUTILS_SOURCE)
 	$(COREUTILS_CAT) $(DL_DIR)/$(COREUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(COREUTILS_DIR) package/coreutils/ coreutils\*.patch
 	$(CONFIG_UPDATE) $(COREUTILS_DIR)/build-aux
+	# ensure rename.m4 file is older than configure / aclocal.m4 so
+	# auto* isn't rerun
+	touch -d '1979-01-01' $(@D)/m4/rename.m4
 	touch $@

 $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
@@ -46,7 +49,7 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
 		ac_cv_func_lstat_dereferences_slashed_symlink=yes \
 		ac_cv_func_lstat_empty_string_bug=no \
 		ac_cv_func_stat_empty_string_bug=no \
-		vb_cv_func_rename_trailing_slash_bug=no \
+		gl_cv_func_rename_trailing_slash_bug=no \
 		ac_cv_have_decl_nanosleep=yes \
 		jm_cv_func_nanosleep_works=yes \
 		gl_cv_func_working_utimes=yes \
@@ -60,12 +63,6 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
 		utils_cv_func_mkstemp_limitations=no \
 		utils_cv_func_mkdir_trailing_slash_bug=no \
 		gl_cv_func_rename_dest_exists_bug=no \
-		ac_cv_func_memcmp_working=yes \
-		ac_cv_have_decl_malloc=yes \
-		gl_cv_func_malloc_0_nonnull=yes \
-		ac_cv_func_malloc_0_nonnull=yes \
-		ac_cv_func_calloc_0_nonnull=yes \
-		ac_cv_func_realloc_0_nonnull=yes \
 		jm_cv_func_gettimeofday_clobber=no \
 		am_cv_func_working_getline=yes \
 		gl_cv_func_working_readdir=yes \
@@ -84,7 +81,7 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
 		jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no \
 		gl_cv_c_restrict=no \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -133,9 +130,9 @@ endif
 # If both coreutils and busybox are selected, make certain coreutils
 # wins the fight over who gets to have their utils actually installed.
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-coreutils: uclibc busybox $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)
+coreutils: busybox $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)
 else
-coreutils: uclibc $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)
+coreutils: $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)
 endif

 # If both coreutils and busybox are selected, the corresponding applets
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -6,6 +6,12 @@
 CTORRENT_VERSION:=dnh3.3.2
 CTORRENT_SOURCE:=ctorrent-$(CTORRENT_VERSION).tar.gz
 CTORRENT_SITE:=http://www.rahul.net/dholmes/ctorrent/
-CTORRENT_CONF_OPT:=--with-ssl=no
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+CTORRENT_CONF_OPT+=--with-ssl=yes
+CTORRENT_DEPENDENCIES+=openssl
+else
+CTORRENT_CONF_OPT+=--with-ssl=no
+endif

 $(eval $(call AUTOTARGETS,package,ctorrent))
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -80,7 +80,7 @@ $(CUPS_DIR)/.configured: $(CUPS_DIR)/.unpacked
 		$(TARGET_CONFIGURE_ARGS) \
 		$(CUPS_CONF_ENV) \
 		CFLAGS="$(CUPS_CFLAGS)" \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -110,7 +110,7 @@ $(CUPS_DIR)/.installed: $(CUPS_DIR)/.compiled
 	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/cups-config
 	touch $@

-cups: uclibc host-autoconf $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed
+cups: host-autoconf $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed

 cups-source: $(DL_DIR)/$(CUPS_SOURCE)

--- a/package/customize/customize.mk
+++ b/package/customize/customize.mk
@@ -6,14 +6,14 @@
 CUST_DIR:=package/customize/source

 $(BUILD_DIR)/.customize:
-	rm -f $(PROJECT_BUILD_DIR)/series
+	rm -f $(BUILD_DIR)/series
 	(cd $(CUST_DIR); \
-	 /bin/ls -d * > $(PROJECT_BUILD_DIR)/series || \
-	 touch $(PROJECT_BUILD_DIR)/series )
-	for f in `cat $(PROJECT_BUILD_DIR)/series`; do \
+	 /bin/ls -d * > $(BUILD_DIR)/series || \
+	 touch $(BUILD_DIR)/series )
+	for f in `cat $(BUILD_DIR)/series`; do \
 		cp -af $(CUST_DIR)/$$f $(TARGET_DIR)/$$f; \
 	done
-	rm -f $(PROJECT_BUILD_DIR)/series
+	rm -f $(BUILD_DIR)/series
 	touch $@

 customize: $(BUILD_DIR)/.customize
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -57,7 +57,7 @@ $(CVS_DIR)/.configured: $(CVS_DIR)/.unpacked
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		cvs_cv_func_printf_ptr=yes \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -75,7 +75,7 @@ $(TARGET_DIR)/$(CVS_TARGET_BINARY): $(CVS_DIR)/$(CVS_BINARY)
 	install -D $(CVS_DIR)/$(CVS_BINARY) $(TARGET_DIR)/$(CVS_TARGET_BINARY)
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(CVS_TARGET_BINARY)

-cvs: uclibc ncurses $(TARGET_DIR)/$(CVS_TARGET_BINARY)
+cvs: ncurses $(TARGET_DIR)/$(CVS_TARGET_BINARY)

 cvs-clean:
 	-$(MAKE) -C $(CVS_DIR) clean
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -29,7 +29,7 @@ $(DASH_DIR)/.configured: $(DASH_DIR)/.unpacked
 	(cd $(DASH_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -54,7 +54,7 @@ $(TARGET_DIR)/$(DASH_TARGET_BINARY): $(DASH_DIR)/$(DASH_BINARY)
 	cp -a $(DASH_DIR)/$(DASH_BINARY) $(TARGET_DIR)/$(DASH_TARGET_BINARY)
 	touch -c $(TARGET_DIR)/$(DASH_TARGET_BINARY)

-dash: uclibc $(TARGET_DIR)/$(DASH_TARGET_BINARY)
+dash: $(TARGET_DIR)/$(DASH_TARGET_BINARY)

 dash-clean:
 	$(MAKE1) CC=$(TARGET_CC) -C $(DASH_DIR) clean
--- a/package/database/mysql_client/mysql_client.mk
+++ b/package/database/mysql_client/mysql_client.mk
@@ -8,7 +8,7 @@ MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://mirrors.24-7-solutions.net/pub/mysql/Downloads/MySQL-5.1
 MYSQL_CLIENT_INSTALL_TARGET = YES
 MYSQL_CLIENT_INSTALL_STAGING = YES
-MYSQL_CLIENT_DEPENDENCIES = uclibc readline ncurses
+MYSQL_CLIENT_DEPENDENCIES = readline ncurses

 MYSQL_CLIENT_CONF_ENV = ac_cv_sys_restartable_syscalls=yes
 MYSQL_CLIENT_CONF_OPT = \
--- a/package/database/sqlite/sqlite.mk
+++ b/package/database/sqlite/sqlite.mk
@@ -4,13 +4,21 @@
 #
 #############################################################

-SQLITE_VERSION = 3.6.16
+SQLITE_VERSION = 3.6.22
 SQLITE_SOURCE = sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES
 SQLITE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 SQLITE_LIBTOOL_PATCH = NO
-SQLITE_DEPENDENCIES = uclibc
+
+ifneq ($(BR2_LARGEFILE),y)
+# the sqlite configure script fails to define SQLITE_DISABLE_LFS when
+# --disable-largefile is passed, breaking the build. Work around it by
+# simply adding it to CFLAGS for configure instead
+SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DSQLITE_DISABLE_LFS"
+# changing CFLAGS doesn't work with config.cache
+SQLITE_USE_CONFIG_CACHE = NO
+endif

 SQLITE_CONF_OPT =	--enable-shared \
 			--enable-static \
--- a/package/dbus-glib/Config.in
+++ b/package/dbus-glib/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_DBUS_GLIB
 	bool "dbus-glib"
 	depends on BR2_PACKAGE_DBUS
-	depends on BR2_PACKAGE_EXPAT
+	depends on BR2_DBUS_EXPAT
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  GLib bindings for D-Bus.
@@ -9,4 +9,4 @@ config BR2_PACKAGE_DBUS_GLIB
 	  http://www.freedesktop.org/software/dbus

 comment "dbus-glib needs dbus to be compiled with expat support"
-	depends on !BR2_PACKAGE_EXPAT
+	depends on BR2_PACKAGE_DBUS && !BR2_DBUS_EXPAT
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -23,55 +23,19 @@ DBUS_GLIB_CONF_OPT = --localstatedir=/var \
 		--disable-doxygen-docs \
 		--enable-asserts=yes

-DBUS_GLIB_DEPENDENCIES = uclibc host-pkgconfig dbus host-dbus host-dbus-glib libglib2 expat
+DBUS_GLIB_DEPENDENCIES = host-pkg-config dbus host-dbus host-dbus-glib libglib2 expat

-$(eval $(call AUTOTARGETS,package,dbus-glib))
+HOST_DBUS_GLIB_DEPENDENCIES = host-dbus host-expat host-libglib2

-# dbus-glib for the host
-DBUS_GLIB_HOST_DIR:=$(BUILD_DIR)/dbus-glib-$(DBUS_GLIB_VERSION)-host
-DBUS_GLIB_HOST_BINARY:=$(HOST_DIR)/usr/bin/dbus-binding-tool
-
-$(DL_DIR)/$(DBUS_GLIB_SOURCE):
-	$(call DOWNLOAD,$(DBUS_GLIB_SITE),$(DBUS_GLIB_SOURCE))
-
-$(STAMP_DIR)/host_dbusglib_unpacked: $(DL_DIR)/$(DBUS_GLIB_SOURCE)
-	mkdir -p $(DBUS_GLIB_HOST_DIR)
-	$(INFLATE$(suffix $(DBUS_GLIB_SOURCE))) $< | \
-		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(DBUS_GLIB_HOST_DIR) $(TAR_OPTIONS) -
-	touch $@
-
-$(STAMP_DIR)/host_dbusglib_configured: $(STAMP_DIR)/host_dbusglib_unpacked $(STAMP_DIR)/host_dbus_installed $(STAMP_DIR)/host_expat_installed $(STAMP_DIR)/host_libglib2_installed
-	(cd $(DBUS_GLIB_HOST_DIR); rm -rf config.cache; \
-		$(HOST_CONFIGURE_OPTS) \
-		CFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
-		--prefix="$(HOST_DIR)/usr" \
-		--sysconfdir="$(HOST_DIR)/etc" \
+HOST_DBUS_GLIB_CONF_OPT = \
 		--disable-tests \
 		--disable-xml-docs \
 		--disable-bash-completion \
 		--disable-doxygen-docs \
-		--enable-asserts=yes \
-	)
-	touch $@
+		--enable-asserts=yes

-$(STAMP_DIR)/host_dbusglib_compiled: $(STAMP_DIR)/host_dbusglib_configured
-	$(HOST_MAKE_ENV) $(MAKE) -C $(DBUS_GLIB_HOST_DIR)
-	touch $@
+$(eval $(call AUTOTARGETS,package,dbus-glib))
+$(eval $(call AUTOTARGETS,package,dbus-glib,host))

-$(STAMP_DIR)/host_dbusglib_installed: $(STAMP_DIR)/host_dbusglib_compiled
-	$(HOST_MAKE_ENV) $(MAKE) -C $(DBUS_GLIB_HOST_DIR) install
-	touch $@
-
-host-dbus-glib: $(STAMP_DIR)/host_dbusglib_installed
-
-host-dbus-glib-source: dbus-glib-source
-
-host-dbus-glib-clean:
-	rm -f $(addprefix $(STAMP_DIR)/host_dbusglib_,unpacked configured compiled installed)
-	-$(MAKE) -C $(DBUS_GLIB_HOST_DIR) uninstall
-	-$(MAKE) -C $(DBUS_GLIB_HOST_DIR) clean
-
-host-dbus-glib-dirclean:
-	rm -rf $(DBUS_GLIB_HOST_DIR)
+# dbus-glib for the host
+DBUS_GLIB_HOST_BINARY:=$(HOST_DIR)/usr/bin/dbus-binding-tool
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -19,6 +19,6 @@ DBUS_PYTHON_CONF_ENV = am_cv_pathless_PYTHON=python \

 DBUS_PYTHON_CONF_OPT = --disable-html-docs --disable-api-docs

-DBUS_PYTHON_DEPENDENCIES = uclibc dbus-glib libpython
+DBUS_PYTHON_DEPENDENCIES = dbus-glib libpython

 $(eval $(call AUTOTARGETS,package,dbus-python))
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -12,7 +12,7 @@ comment "dbus not available (need expat or libxml2)"
 choice
 	prompt "XML library to use"
 	depends on BR2_PACKAGE_DBUS
-	default BR2_DBUS_LIBXML2 if BR2_PACKAGE_LIBXML2
+	default BR2_DBUS_LIBXML2 if (BR2_PACKAGE_LIBXML2 && !BR2_PACKAGE_EXPAT)
 	default BR2_DBUS_EXPAT
 	help
 	  Select the XML library to use with D-Bus. Select Expat
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,9 +3,11 @@
 # dbus
 #
 #############################################################
-DBUS_VERSION = 1.2.12
+DBUS_VERSION = 1.2.16
 DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
+DBUS_LIBTOOL_PATCH = NO
+HOST_DBUS_LIBTOOL_PATCH = NO
 DBUS_INSTALL_STAGING = YES
 DBUS_INSTALL_TARGET = YES
 ifeq ($(BR2_ENABLE_DEBUG),y)
@@ -16,7 +18,7 @@ else
 DBUS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip STRIPPROG="$(STRIPCMD)"
 endif

-DBUS_DEPENDENCIES = uclibc host-pkgconfig
+DBUS_DEPENDENCIES = host-pkg-config

 DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
 DBUS_CONF_OPT = --program-prefix="" \
@@ -48,41 +50,8 @@ else
 DBUS_CONF_OPT += --without-x
 endif

-$(eval $(call AUTOTARGETS,package,dbus))
-
-# fix rebuild if /var/lib is a symlink to /tmp
-$(DBUS_HOOK_POST_BUILD): $(DBUS_TARGET_BUILD)
-	rm -rf /tmp/dbus
-	touch $@
-
-$(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET)
-	rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
-	rm -rf $(TARGET_DIR)/var/lib/dbus
-	ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
-	$(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d
-	touch $@
-
-# dbus for the host
-DBUS_HOST_DIR:=$(BUILD_DIR)/dbus-$(DBUS_VERSION)-host
-DBUS_HOST_INTROSPECT:=$(DBUS_HOST_DIR)/introspect.xml
-
-$(DL_DIR)/$(DBUS_SOURCE):
-	$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
-
-$(STAMP_DIR)/host_dbus_unpacked: $(DL_DIR)/$(DBUS_SOURCE)
-	mkdir -p $(DBUS_HOST_DIR)
-	$(INFLATE$(suffix $(DBUS_SOURCE))) $< | \
-		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(DBUS_HOST_DIR) $(TAR_OPTIONS) -
-	touch $@
-
-$(STAMP_DIR)/host_dbus_configured: $(STAMP_DIR)/host_dbus_unpacked $(STAMP_DIR)/host_expat_installed $(STAMP_DIR)/host_pkgconfig_installed
-	(cd $(DBUS_HOST_DIR); rm -rf config.cache; \
-		$(HOST_CONFIGURE_OPTS) \
-		CFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
-		--prefix="$(HOST_DIR)/usr" \
-		--sysconfdir="$(HOST_DIR)/etc" \
+HOST_DBUS_DEPENDENCIES = host-pkg-config host-expat
+HOST_DBUS_CONF_OPT = \
 		--with-dbus-user=dbus \
 		--disable-tests \
 		--disable-asserts \
@@ -93,28 +62,29 @@ $(STAMP_DIR)/host_dbus_configured: $(STAMP_DIR)/host_dbus_unpacked $(STAMP_DIR)/
 		--disable-static \
 		--enable-dnotify \
 		--without-x \
-		--with-xml=expat \
-	)
-	touch $@
+		--with-xml=expat

-$(STAMP_DIR)/host_dbus_compiled: $(STAMP_DIR)/host_dbus_configured
-	$(HOST_MAKE_ENV) $(MAKE) -C $(DBUS_HOST_DIR)
-	touch $@
+# dbus for the host
+DBUS_HOST_INTROSPECT=$(HOST_DBUS_DIR)/introspect.xml

-$(STAMP_DIR)/host_dbus_installed: $(STAMP_DIR)/host_dbus_compiled
-	$(MAKE) -C $(DBUS_HOST_DIR) install
+HOST_DBUS_GEN_INTROSPECT = \
 	$(HOST_DIR)/usr/bin/dbus-daemon --introspect > $(DBUS_HOST_INTROSPECT)
+
+HOST_DBUS_POST_INSTALL_HOOKS += HOST_DBUS_GEN_INTROSPECT
+
+$(eval $(call AUTOTARGETS,package,dbus))
+$(eval $(call AUTOTARGETS,package,dbus,host))
+
+# fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink)
+$(DBUS_HOOK_POST_BUILD): $(DBUS_TARGET_BUILD)
+	rm -rf $(TARGET_DIR)/var/lib/dbus
 	touch $@

-host-dbus: $(STAMP_DIR)/host_dbus_installed
-
-host-dbus-source: dbus-source
-
-host-dbus-clean:
-	rm -f $(addprefix $(STAMP_DIR)/host_dbus_,unpacked configured compiled installed)
-	rm -f $(DBUS_HOST_INTROSPECT)
-	-$(MAKE) -C $(DBUS_HOST_DIR) uninstall
-	-$(MAKE) -C $(DBUS_HOST_DIR) clean
-
-host-dbus-dirclean:
-	rm -rf $(DBUS_HOST_DIR)
+$(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET)
+ifneq ($(BR2_HAVE_DEVFILES),y)
+	rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
+endif
+	rm -rf $(TARGET_DIR)/var/lib/dbus
+	ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
+	$(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d
+	touch $@
--- a/package/devmem2/devmem2.mk
+++ b/package/devmem2/devmem2.mk
@@ -23,7 +23,7 @@ $(TARGET_DIR)/sbin/$(DEVMEM2_BINARY): $(DEVMEM2_DIR)/$(DEVMEM2_BINARY)
 	cp $^ $@
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@

-devmem2: uclibc $(TARGET_DIR)/sbin/$(DEVMEM2_BINARY)
+devmem2: $(TARGET_DIR)/sbin/$(DEVMEM2_BINARY)

 devmem2-source: $(DL_DIR)/$(DEVMEM2_SOURCE)

--- a/Show More
+++ b/Show More