buildroot: fix version for 2009.02-rc2

2009-01-16 19:30:21 +00:00
118 changed files with 1190 additions and 2128 deletions
--- a/Config.in
+++ b/Config.in
@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG

 config BR2_VERSION
 	string
-	default "2009.02-rc2"
+	default "2009.02-rc1"

 source "target/Config.in.arch"
 source "target/device/Config.in"
@@ -182,6 +182,7 @@ config BR2_RECENT

 config BR2_CONFIG_CACHE
 	bool "Use a central configure cache file"
+	default n
 	help
 	  This determines if a central config cache is used by
 	  packages, reducing the configure time for packages as each
--- a/1
+++ b/1
@@ -506,7 +506,6 @@ help:
 	@echo 'Configuration:'
 	@echo '  menuconfig             - interactive curses-based configurator'
 	@echo '  oldconfig              - resolve any unresolved symbols in .config'
-	@echo '  configured             - make {uclibc/busybox/linux26}-config'
 	@echo '  saveconfig             - save current configuration under local/<project>'
 	@echo '  getconfig              - restore saved configuration from local/<project>'
 	@echo
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,10 @@

 <p>

-The latest release can always be dowloaded from
-<a href="/downloads/">http://buildroot.uclibc.org/downloads/</a>.
-
-<p>
-
-You can also obtain <a href="/downloads/snapshots/">Daily
-Snapshots</a> of the latest Buildroot source tree if you want to to
-follow development, but cannot or do not wish to use Subversion (svn).
+The best way to obtain and update your own copy of buildroot is to fetch the
+latest version using <a href="subversion.html">Subversion</a>.  You can also
+obtain <a href= "downloads/snapshots/">Daily Snapshots</a> of the latest
+buildroot source tree but cannot or do not wish to use Subversion (svn).

 <ul>
 	<li> Click here to <a href="downloads/snapshots/">Daily Snapshots</a>.
--- a/docs/news.html
+++ b/docs/news.html
@@ -3,18 +3,6 @@

 <ul>

-  <li><b>16 January 2009 -- Release candidate and new maintainer</b>
-    <p>It has been a long time coming, but we finally have a new
-    release candidate! - And a new maintainer to match (Peter Korsgaard).</p>
-
-    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
-    <a href="/downloads/buildroot-2009.02-rc1.tar.bz2">2009.02-rc1
-    release candidate</a>, and report any problems found to the <a
-    href="lists.html">mailing list</a> or <a
-    href="http://bugs.uclibc.org">bug tracker</a>. The plan is to
-    release 2009.02 in time for <a
-    href="http://www.fosdem.org/2009/">FOSDEM</a>.</p>
-
  <li><b>16 July 2006 -- Buildroot mailing list</b>
    <p>Buildroot now has its own <a href=lists.html>mailing list</a>.</p>

--- a/package/Config.in
+++ b/package/Config.in
@@ -255,6 +255,7 @@ source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
 source "package/pciutils/Config.in"
 source "package/pcmcia/Config.in"
+source "package/raidtools2/Config.in"
 source "package/setserial/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 # busybox has fdisk
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -248,9 +248,6 @@ $(BUILD_DIR)/%/.stamp_configured:
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--sysconfdir=/etc \
-		$(DISABLE_DOCUMENTATION) \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
 		$(QUIET) $($(PKG)_CONF_OPT)
 	$(Q)touch $@

--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -71,10 +71,6 @@ ifeq ($(BR2_SOFT_FLOAT),y)
 TARGET_CFLAGS+=-msoft-float
 endif

-ifeq ($(BR2_VFP_FLOAT),y)
-TARGET_CFLAGS+=-mfpu=vfp
-endif
-
 # enable VIS for v9a and v9b
 ifeq ($(findstring y,$(BR2_sparc_v9a)$(BR2_sparc64_v9a)$(BR2_sparc_v9b)$(BR2_sparc64_v9b)),y)
 TARGET_CFLAGS+=-mvis
@@ -185,10 +181,6 @@ INSTALL=/usr/bin/install
 FLEX:=$(shell which flex || type -p flex)
 BISON:=$(shell which bison || type -p bison)

-# hostcc version as an integer - E.G. 4.3.2 => 432
-HOSTCC_VERSION:=$(shell $(HOSTCC) --version | \
-	sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p')
-
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 	-e 's/sparc.*/sparc/' \
 	-e 's/arm.*/arm/g' \
@@ -353,10 +345,6 @@ ifneq ($(BR2_LARGEFILE),y)
 DISABLE_LARGEFILE= --disable-largefile
 endif

-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-DISABLE_DOCUMENTATION=--without-html-dir --disable-gtk-doc
-endif
-
 ifneq ($(BR2_INET_IPV6),y)
 DISABLE_IPV6= --disable-ipv6
 endif
--- a/package/bridge-utils/bridge.mk
+++ b/package/bridge-utils/bridge.mk
@@ -11,7 +11,7 @@ BRIDGE_AUTORECONF:=YES
 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_CONF_OPT:=--with-linux-headers=$(LINUX_HEADERS_DIR) $(DISABLE_NLS)
 BRIDGE_DEPENDENCIES:=uclibc

 $(eval $(call AUTOTARGETS,package,bridge))
--- a/package/busybox/busybox-1.13.2-depmod.patch
+++ b/package/busybox/busybox-1.13.2-depmod.patch
@@ -1,121 +0,0 @@
--- busybox-1.13.2/modutils/depmod.c	Sun Nov  9 18:28:03 2008
-+++ busybox-1.13.2-depmod/modutils/depmod.c	Mon Jan 12 23:12:59 2009
-@@ -33,7 +33,7 @@
- enum {
- 	ARG_a = (1<<0), /* All modules, ignore mods in argv */
- 	ARG_A = (1<<1), /* Only emit .ko that are newer than modules.dep file */
-	ARG_b = (1<<2), /* not /lib/modules/$(uname -r)/ but this base-dir */
-+	ARG_b = (1<<2), /* base directory when modules are in staging area */
- 	ARG_e = (1<<3), /* with -F, print unresolved symbols */
- 	ARG_F = (1<<4), /* System.map that contains the symbols */
- 	ARG_n = (1<<5)  /* dry-run, print to stdout only */
-@@ -57,7 +57,7 @@
- 	*first = info;
- 
- 	info->dnext = info->dprev = info;
-	info->name = xstrdup(fname);
-+	info->name = xasprintf("/%s", fname);
- 	info->modname = filename2modname(fname, NULL);
- 	for (ptr = image; ptr < image + len - 10; ptr++) {
- 		if (strncmp(ptr, "depends=", 8) == 0) {
-@@ -123,44 +123,61 @@
- 	}
- }
- 
-+static void xfreopen_write(const char *file, FILE *f)
-+{
-+	if (freopen(file, "w", f) == NULL)
-+		bb_perror_msg_and_die("can't open '%s'", file);
-+}
-+
- int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int depmod_main(int argc UNUSED_PARAM, char **argv)
- {
- 	module_info *modules = NULL, *m, *dep;
-	char *moddir_base = (char *)CONFIG_DEFAULT_MODULES_DIR;
-+	const char *moddir_base = "/";
-+	char *moddir, *version;
-+	struct utsname uts;
- 	int tmp;
- 
- 	getopt32(argv, "aAb:eF:n", &moddir_base, NULL);
- 	argv += optind;
- 
- 	/* goto modules location */
-+	xchdir(moddir_base);
- 
- 	/* If a version is provided, then that kernel version's module directory
- 	 * is used, rather than the current kernel version (as returned by
- 	 * "uname -r").  */
-	xchdir(moddir_base);
-	if (*argv && (sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3)) {
-		xchdir(*argv++);
-+	if (*argv && sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3) {
-+		version = *argv++;
- 	} else {
-		struct utsname uts;
- 		uname(&uts);
-		xchdir(uts.release);
-+		version = uts.release;
- 	}
-	/* If no modules are given on the command-line, -a is on per default.  */
-	option_mask32 |= *argv == NULL;
-+	moddir = concat_path_file(&CONFIG_DEFAULT_MODULES_DIR[1], version);
- 
- 	/* Scan modules */
-	moddir_base = xrealloc_getcwd_or_warn(NULL);
-	do {
-		recursive_action((option_mask32 & ARG_a) ? moddir_base : *argv,
-				ACTION_RECURSE, parse_module, NULL,  &modules, 0);
-	} while (!(option_mask32 & ARG_a) && *(++argv));
-+	if (*argv) {
-+		char *modfile;
-+		struct stat sb;
-+		do {
-+			modfile = concat_path_file(moddir, *argv);
-+			xstat(modfile, &sb);
-+			parse_module(modfile, &sb, &modules, 0);
-+			free(modfile);
-+		} while (*(++argv));
-+	} else {
-+		recursive_action(moddir, ACTION_RECURSE,
-+				 parse_module, NULL, &modules, 0);
-+	}
-+
-+	/* Prepare for writing out the dep files */
-+	xchdir(moddir);
- 	if (ENABLE_FEATURE_CLEAN_UP)
-		free(moddir_base);
-+		free(moddir);
- 
- 	/* Generate dependency and alias files */
- 	if (!(option_mask32 & ARG_n))
-		freopen(CONFIG_DEFAULT_DEPMOD_FILE, "w", stdout);
-+		xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout);
- 	for (m = modules; m != NULL; m = m->next) {
- 		printf("%s:", m->name);
- 
-@@ -174,12 +191,12 @@
- 			dep->dprev->dnext = dep->dnext;
- 			dep->dnext = dep->dprev = dep;
- 		}
-		puts("");
-+		bb_putchar('\n');
- 	}
- 
- #if ENABLE_FEATURE_MODUTILS_ALIAS
- 	if (!(option_mask32 & ARG_n))
-		freopen("modules.alias", "w", stdout);
-+		xfreopen_write("modules.alias", stdout);
- 	for (m = modules; m != NULL; m = m->next) {
- 		while (m->aliases) {
- 			printf("alias %s %s\n",
-@@ -190,7 +207,7 @@
- #endif
- #if ENABLE_FEATURE_MODUTILS_SYMBOLS
- 	if (!(option_mask32 & ARG_n))
-		freopen("modules.symbols", "w", stdout);
-+		xfreopen_write("modules.symbols", stdout);
- 	for (m = modules; m != NULL; m = m->next) {
- 		while (m->symbols) {
- 			printf("alias symbol:%s %s\n",
--- a/package/busybox/busybox-1.13.2-tar.patch
+++ b/package/busybox/busybox-1.13.2-tar.patch
@@ -1,11 +0,0 @@
--- busybox-1.13.2/archival/tar.c	Sun Nov  9 18:28:02 2008
-+++ busybox-1.13.2-tar/archival/tar.c	Tue Jan 20 03:52:04 2009
-@@ -591,8 +591,6 @@
- 	struct TarBallInfo tbInfo;
- 
- 	tbInfo.hlInfoHead = NULL;
-
-	fchmod(tar_fd, 0644);
- 	tbInfo.tarFd = tar_fd;
- 	tbInfo.verboseFlag = verboseFlag;
- 
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -40,7 +40,7 @@ $(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
 	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
 	cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
 	(cd $(STAGING_DIR)/usr/lib/; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
+		ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so; \
 	)
 	(cd $(STAGING_DIR)/usr/lib; \
 		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -46,6 +46,7 @@ ifeq ($(BR2_PACKAGE_DIRECTFB),y)
 	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
 	CAIRO_DEPENDENCIES_EXTRA = directfb
 endif
+CAIRO_CONF_OPT += --disable-gtk-doc --without-html-dir

 CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 

--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -31,7 +31,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked
 		DBUS_CFLAGS="-I$(STAGING_DIR)/usr/include/dbus-1.0 -I$(STAGING_DIR)/usr/lib/dbus-1.0/include" \
 		DBUS_LIBS="$(STAGING_DIR)/usr/lib/libdbus-1.so" \
 		DBUS_GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
-		DBUS_GLIB_LIBS="$(STAGING_DIR)/usr/lib/libglib-2.0.so $(STAGING_DIR)/usr/lib/libgobject-2.0.so $(STAGING_DIR)/usr/lib/libgmodule-2.0.so $(STAGING_DIR)/usr/lib/libgthread-2.0.so" \
+		DBUS_GLIB_LIBS="$(STAGING_DIR)/lib/libglib-2.0.so $(STAGING_DIR)/lib/libgobject-2.0.so $(STAGING_DIR)/lib/libgmodule-2.0.so $(STAGING_DIR)/lib/libgthread-2.0.so" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -47,7 +47,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked
 	touch $(DBUS_GLIB_DIR)/.configured

 $(DBUS_GLIB_DIR)/$(DBUS_GLIB_BINARY): $(DBUS_GLIB_DIR)/.configured
-	$(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so" -C $(DBUS_GLIB_DIR) all
+	$(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/lib/libexpat.so" -C $(DBUS_GLIB_DIR) all

 $(STAGING_DIR)/usr/lib/libdbus-glib-1.so.2.0.0: $(DBUS_GLIB_DIR)/$(DBUS_GLIB_BINARY)
 	cp -a $(DBUS_GLIB_DIR)/dbus/.libs/libdbus-glib-1.so* $(STAGING_DIR)/usr/lib
@@ -58,7 +58,7 @@ $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-glib-1.
 	cp -a $(DBUS_GLIB_DIR)/dbus/.libs/dbus-binding-tool $(TARGET_DIR)/usr/bin
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-glib-1.so.2.0.0

-dbus-glib: uclibc pkgconfig dbus expat libglib2 $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY)
+dbus-glib: uclibc pkgconfig dbus libglib2 $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY)

 dbus-glib-clean:
 	rm -f $(TARGET_DIR)/usr/lib/libdbus-glib-1.so.2*
--- a/package/directfb/directfb-1.2.7-ppc-compile-fix.patch
+++ b/package/directfb/directfb-1.2.7-ppc-compile-fix.patch
@@ -1,17 +0,0 @@
---
- lib/direct/ppcasm_memcpy_cachable.S |    2 --
- 1 file changed, 2 deletions(-)
-
-Index: DirectFB-1.2.7/lib/direct/ppcasm_memcpy_cachable.S
-===================================================================
--- DirectFB-1.2.7.orig/lib/direct/ppcasm_memcpy_cachable.S
-+++ DirectFB-1.2.7/lib/direct/ppcasm_memcpy_cachable.S
-@@ -34,8 +34,6 @@
- 
- #define __ASSEMBLY__
- 
-#include <linux/config.h>
-
- #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
- #define L1_CACHE_LINE_SIZE       16
- #define LG_L1_CACHE_LINE_SIZE     4 
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -3,16 +3,19 @@
 # directfb
 #
 #############################################################
+#DIRECTFB_VERSION:=0.9.25.1
+#DIRECTFB_SITE:=http://www.directfb.org/downloads/Old
 DIRECTFB_VERSION_MAJOR:=1.2
-DIRECTFB_VERSION:=1.2.7
+DIRECTFB_VERSION:=1.2.6
 #DIRECTFB_VERSION:=1.3.0	is a development version
 #DIRECTFB_VERSION_MAJOR:=1.3
 DIRECTFB_SITE:=http://www.directfb.org/downloads/Core
 DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz
-DIRECTFB_AUTORECONF = NO
-DIRECTFB_LIBTOOL_PATCH = NO
-DIRECTFB_INSTALL_STAGING = YES
-DIRECTFB_INSTALL_TARGET = YES
+DIRECTFB_CAT:=$(ZCAT)
+DIRECTFB_DIR:=$(BUILD_DIR)/DirectFB-$(DIRECTFB_VERSION)
+DIRECTFB_STAGING:=directfb-$(DIRECTFB_VERSION_MAJOR)-0
+DIRECTFB_BIN:=usr/lib/libdirectfb-$(DIRECTFB_VERSION_MAJOR).so.0
+DIRECTFB_DEP:=zlib

 ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y)
 DIRECTFB_MULTI:=--enable-multi --enable-fusion
@@ -102,29 +105,96 @@ else
 DIRECTFB_JPEG:=--disable-jpeg
 endif

-DIRECTFB_CONF_OPT = \
-	--localstatedir=/var \
-	--with-gfxdrivers=$(DIRECTFB_GFX) \
-	--with-inputdrivers=$(DIRECTFB_INPUT) \
-	--enable-static \
-	--enable-shared \
-	--disable-explicit-deps \
-	$(DIRECTFB_MULTI) \
-	$(DIRECTFB_X) \
-	$(DIRECTFB_JPEG) \
-	$(DIRECTFB_PNG) \
-	$(DIRECTFB_GIF) \
-	$(DIRECTFB_UNIQUE) \
-	--enable-linux-input \
-	--enable-zlib \
-	--enable-freetype \
-	--enable-fbdev \
-	--disable-sysfs \
-	--disable-sdl \
-	--disable-vnc \
-	--disable-video4linux \
-	--disable-video4linux2
+$(DL_DIR)/$(DIRECTFB_SOURCE):
+	$(call DOWNLOAD,$(DIRECTFB_SITE),$(DIRECTFB_SOURCE))

-DIRECTFB_DEPENDENCIES = uclibc $(DIRECTFB_DEP) freetype $(DIRECTFB_FUSION)
+directfb-source: $(DL_DIR)/$(DIRECTFB_SOURCE)

-$(eval $(call AUTOTARGETS,package,directfb))
+$(DIRECTFB_DIR)/.unpacked: $(DL_DIR)/$(DIRECTFB_SOURCE)
+	$(DIRECTFB_CAT) $(DL_DIR)/$(DIRECTFB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(DIRECTFB_DIR) package/directfb/ DirectFB-$(DIRECTFB_VERSION)\*.patch
+	touch $@
+
+$(DIRECTFB_DIR)/.configured: $(DIRECTFB_DIR)/.unpacked
+	(cd $(DIRECTFB_DIR); rm -f config.cache; \
+	ac_cv_header_linux_wm97xx_h=no \
+	ac_cv_header_linux_sisfb_h=no \
+	ac_cv_header_asm_page_h=no \
+	$(AUTO_CONFIGURE_TARGET) \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-gfxdrivers=$(DIRECTFB_GFX) \
+		--with-inputdrivers=$(DIRECTFB_INPUT) \
+		--enable-static \
+		--enable-shared \
+		$(DIRECTFB_MULTI) \
+		$(DIRECTFB_X) \
+		$(DIRECTFB_JPEG) \
+		$(DIRECTFB_PNG) \
+		$(DIRECTFB_GIF) \
+		$(DIRECTFB_UNIQUE) \
+		--enable-linux-input \
+		--enable-zlib \
+		--enable-freetype \
+		--enable-fbdev \
+		--disable-sysfs \
+		--disable-sdl \
+		--disable-vnc \
+		--disable-video4linux \
+		--disable-video4linux2 )
+	touch $@
+
+$(DIRECTFB_DIR)/.compiled: $(DIRECTFB_DIR)/.configured
+	$(MAKE) PATH=$(STAGING_DIR)/usr/lib:$(PATH) \
+		$(TARGET_CONFIGURE_OPTS) \
+		-C $(DIRECTFB_DIR)
+	touch $(DIRECTFB_DIR)/.compiled
+
+$(STAGING_DIR)/$(DIRECTFB_BIN): $(DIRECTFB_DIR)/.compiled
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DIRECTFB_DIR) install
+	$(SED) "s, /usr/lib, $(STAGING_DIR)/usr/lib,g" \
+		$(STAGING_DIR)/usr/lib/libdirect.la \
+		$(STAGING_DIR)/usr/lib/libdirectfb.la \
+		$(STAGING_DIR)/usr/lib/libfusion.la \
+		`find $(STAGING_DIR)/usr/lib/directfb-$(DIRECTFB_VERSION_MAJOR)-0/ -name '*.la'`
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		$(STAGING_DIR)/usr/bin/*directfb-config
+
+$(TARGET_DIR)/$(DIRECTFB_BIN): $(STAGING_DIR)/$(DIRECTFB_BIN)
+	cd $(STAGING_DIR)/usr/lib/; find $(DIRECTFB_STAGING) -type f -name '*.so' \
+		| xargs -IREPL install -Dm644 REPL $(TARGET_DIR)/usr/lib/REPL
+	mkdir -p $(TARGET_DIR)/usr/lib/directfb-$(DIRECTFB_VERSION_MAJOR)-0/gfxdrivers
+	cp -dpf $(STAGING_DIR)/usr/lib/libfusion*.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_DIRECTFB_UNIQUE),y)
+	cp -dpf $(STAGING_DIR)/usr/lib/libuniquewm*.so.* $(TARGET_DIR)/usr/lib/
+endif
+	cp -dpf $(STAGING_DIR)/usr/lib/libdirect*.so.* $(TARGET_DIR)/usr/lib/
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) \
+		$(TARGET_DIR)/usr/lib/libdirect*.so.* \
+		$(TARGET_DIR)/usr/lib/libfusion*.so.*
+ifeq ($(BR2_PACKAGE_DIRECTFB_UNIQUE),y)
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) \
+		$(TARGET_DIR)/usr/lib/libuniquewm*.so.*
+endif
+
+directfb: uclibc $(DIRECTFB_DEP) freetype $(DIRECTFB_FUSION) $(TARGET_DIR)/$(DIRECTFB_BIN)
+
+directfb-unpacked: $(DIRECTFB_DIR)/.unpacked
+
+directfb-clean:
+	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(DIRECTFB_DIR) uninstall
+	-$(MAKE) -C $(DIRECTFB_DIR) clean
+	rm -f $(DIRECTFB_DIR)/.configured $(DIRECTFB_DIR)/.compiled
+
+directfb-dirclean:
+	rm -rf $(DIRECTFB_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_PACKAGE_DIRECTFB),y)
+TARGETS+=directfb
+endif
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -8,7 +8,7 @@ GMPC_SOURCE = gmpc-$(GMPC_VERSION).tar.gz
 GMPC_SITE = http://download.sarine.nl/download/Programs/gmpc/$(GMPC_VERSION)/
 GMPC_LIBTOOL_PATCH = NO
 GMPC_CONF_ENV = ac_cv_lib_curl_curl_global_init=yes
-GMPC_CONF_OPT = --disable-mmkeys
+GMPC_CONF_OPT = --disable-mmkeys $(DISABLE_NLS)


 GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd
--- a/package/input-tools/joystick-20051019-rint.patch
+++ b/package/input-tools/joystick-20051019-rint.patch
@@ -1,18 +0,0 @@
-diff -urN joystick-20051019.orig/utils/jscal.c joystick-20051019/utils/jscal.c
--- joystick-20051019.orig/utils/jscal.c	2004-10-19 09:51:52.000000000 +0200
-+++ joystick-20051019/utils/jscal.c	2009-01-18 10:48:50.000000000 +0100
-@@ -141,10 +141,10 @@
- 	c = 32767.0 / (inputs.cmin[1] - inputs.cmax[0]);
- 	d = 32767.0 / (inputs.cmin[2] - inputs.cmax[1]);
- 
-	results[0] = rint(a);
-	results[1] = rint(b);
-	results[2] = rint(c*16384.0);
-	results[3] = rint(d*16384.0);
-+	results[0] = (int) (a + 0.5);
-+	results[1] = (int) (b + 0.5);
-+	results[2] = (int) (c*16384.0 + 0.5);
-+	results[3] = (int) (d*16384.0 + 0.5);
- 
- 	return 1;
- }
--- a/package/kismet/kismet-2007-10-R1-memset.patch
+++ b/package/kismet/kismet-2007-10-R1-memset.patch
@@ -1,45 +0,0 @@
-diff -urN kismet-2007-10-R1-0rig//kismet_wrapper.cc kismet-2007-10-R1/kismet_wrapper.cc
--- kismet-2007-10-R1-0rig//kismet_wrapper.cc	2007-10-06 23:50:03.000000000 +0200
-+++ kismet-2007-10-R1/kismet_wrapper.cc	2009-01-21 01:12:42.000000000 +0100
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- 
- #include "config.h"
-+#include <string.h>
- 
- /* Blob of globals since sighandler needs them */
- vector<string> postcli_err;
-diff -urN kismet-2007-10-R1-0rig//ringbuf.cc kismet-2007-10-R1/ringbuf.cc
--- kismet-2007-10-R1-0rig//ringbuf.cc	2005-12-11 20:14:39.000000000 +0100
-+++ kismet-2007-10-R1/ringbuf.cc	2009-01-21 01:12:26.000000000 +0100
-@@ -17,6 +17,7 @@
- */
- 
- #include "ringbuf.h"
-+#include <string.h>
- 
- RingBuffer::RingBuffer(int in_size) {
-     ring_len = in_size;
-diff -urN kismet-2007-10-R1-0rig//util.cc kismet-2007-10-R1/util.cc
--- kismet-2007-10-R1-0rig//util.cc	2006-08-28 22:37:29.000000000 +0200
-+++ kismet-2007-10-R1/util.cc	2009-01-21 01:12:26.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <string.h>
- 
- // We need this to make uclibc happy since they don't even have rintf...
- #ifndef rintf
-diff -urN kismet-2007-10-R1-0rig//util.h kismet-2007-10-R1/util.h
--- kismet-2007-10-R1-0rig//util.h	2006-08-28 22:37:29.000000000 +0200
-+++ kismet-2007-10-R1/util.h	2009-01-21 01:12:26.000000000 +0100
-@@ -65,7 +65,7 @@
-         end = op.end;
-         return *this;
-     }
-};
-+} swt;
- vector<smart_word_token> SmartStrTokenize(string in_str, string in_split, int return_partial = 1);
- 
- vector<string> LineWrap(string in_txt, unsigned int in_hdr_len, unsigned int in_maxlen);
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -62,7 +62,6 @@ $(TARGET_DIR)/$(KISMET_TARGET_DIRECTORY)/$(KISMET_BINARY): $(KISMET_DIR)/$(KISME

 kismet: uclibc ncurses libpcap dbus $(TARGET_DIR)/$(KISMET_TARGET_DIRECTORY)/$(KISMET_BINARY)

-kismet-unpacked: $(KISMET_DIR)/.patched

 kismet-clean:
 	rm -f $(TARGET_DIR)/$(KISMET_TARGET_DIRECTORY)/kismet
--- a/package/libcgicc/cgicc-3.2.7-memset.patch
+++ b/package/libcgicc/cgicc-3.2.7-memset.patch
@@ -1,12 +0,0 @@
-diff -urN cgicc-3.2.7-0rig//demo/dns.cpp cgicc-3.2.7/demo/dns.cpp
--- cgicc-3.2.7-0rig//demo/dns.cpp	2009-01-21 00:24:13.000000000 +0100
-+++ cgicc-3.2.7/demo/dns.cpp	2009-01-21 00:24:30.000000000 +0100
-@@ -34,6 +34,7 @@
- #include <vector>
- #include <stdexcept>
- #include <iostream>
-+#include <string.h>
- 
- #include "cgicc/CgiDefs.h"
- #include "cgicc/Cgicc.h"
-
--- a/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch
+++ b/package/libcgicc/cgicc-3.2.7-sort-undeclared.patch
@@ -1,38 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] sort is now in <algorithm>
-
-When built with gcc-4.3.2, cgicc-3.2.7 cannot be compiled any more; sort
-is now being part of <algorithm> and must be written as ::sort:
-
-cardgame.cpp:1232: error: 'sort' was not declared in this scope
-make[2]: *** [cardgame.o] Error 1
-
-Fix it.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
---
- demo/cardgame.cpp |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: cgicc-3.2.7/demo/cardgame.cpp
-===================================================================
--- cgicc-3.2.7.orig/demo/cardgame.cpp
-+++ cgicc-3.2.7/demo/cardgame.cpp
-@@ -36,6 +36,7 @@
- #include <sstream>
- #include <fstream>
- #include <queue>
-+#include <algorithm>
- 
- #include "cgicc/CgiDefs.h"
- #include "cgicc/Cgicc.h"
-@@ -1043,7 +1044,7 @@ namespace CardGameTools
- 
- 	void drawPlayerCards(datasplayer *vPlayer)
- 	{
-		sort (vPlayer->cardsList->begin(),vPlayer->cardsList->end());
-+		std::sort (vPlayer->cardsList->begin(),vPlayer->cardsList->end());
- 		cout <<"<form name=\"cards\">"; 
- 		cout <<"<input type=\"hidden\" name=\"actionner\" value=\"\">"; 
- 		cout <<"<input type=\"hidden\" name=\"card\" value=\"\">"; 
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -17,8 +17,7 @@ libcgicc-source: $(DL_DIR)/$(LIBCGICC_SOURCE)

 $(LIBCGICC_DIR)/.unpacked: $(DL_DIR)/$(LIBCGICC_SOURCE)
 	$(LIBCGICC_CAT) $(DL_DIR)/$(LIBCGICC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LIBCGICC_DIR) package/libcgicc cgicc\*.patch
-	touch $@
+	touch $(LIBCGICC_DIR)/.unpacked

 $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
 	(cd $(LIBCGICC_DIR); rm -f config.cache; \
@@ -41,11 +40,11 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 	)
-	touch $@
+	touch $(LIBCGICC_DIR)/.configured

 $(LIBCGICC_DIR)/.compiled: $(LIBCGICC_DIR)/.configured
 	$(MAKE) -C $(LIBCGICC_DIR)
-	touch $@
+	touch $(LIBCGICC_DIR)/.compiled

 $(STAGING_DIR)/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install
@@ -56,8 +55,6 @@ $(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/lib/libcgicc.so

 libcgicc: uclibc $(TARGET_DIR)/usr/lib/libcgicc.so

-libcgicc-unpacked: $(LIBCGICC_DIR)/.unpacked
-
 libcgicc-clean:
 		-$(MAKE) -C $(LIBCGICC_DIR) clean

--- a/package/libconfuse/libconfuse-2.6-dont-use-werror.patch
+++ b/package/libconfuse/libconfuse-2.6-dont-use-werror.patch
@@ -1,34 +0,0 @@
-confuse: don't compile with -Werror
-
-Werror isn't really a robust setting for !development.
---
- src/Makefile.am |    2 +-
- src/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: confuse-2.6/src/Makefile.am
-===================================================================
--- confuse-2.6.orig/src/Makefile.am
-+++ confuse-2.6/src/Makefile.am
-@@ -10,7 +10,7 @@
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- 
- if cc_is_gcc
-AM_CFLAGS=-Wall -Werror
-+AM_CFLAGS=-Wall
- endif
- 
- LIBS = @LIBS@
-Index: confuse-2.6/src/Makefile.in
-===================================================================
--- confuse-2.6.orig/src/Makefile.in
-+++ confuse-2.6/src/Makefile.in
-@@ -196,7 +196,7 @@
- libconfuse_la_SOURCES = confuse.c lexer.l
- libconfuse_la_LIBADD = $(LTLIBINTL)
- include_HEADERS = confuse.h
-@cc_is_gcc_TRUE@AM_CFLAGS = -Wall -Werror
-+@cc_is_gcc_TRUE@AM_CFLAGS = -Wall
- CLEANFILES = *~ \#*\#
- AM_LFLAGS = -Pcfg_yy -olex.yy.c
- all: all-am
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -10,7 +10,7 @@ LIBCONFUSE_AUTORECONF:=NO
 LIBCONFUSE_INSTALL_STAGING:=YES
 LIBCONFUSE_INSTALL_TARGET:=YES

-LIBCONFUSE_CONF_OPT:=--enable-shared --disable-rpath
+LIBCONFUSE_CONF_OPT:=--enable-shared --disable-rpath $(DISABLE_NLS)

 LIBCONFUSE_DEPENDENCIES = uclibc

--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -8,7 +8,7 @@ LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download/
 LIBCURL_INSTALL_STAGING = YES
 LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
-		   $(DISABLE_IPV6)
+		   $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)

 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBCURL_DEPENDENCIES += openssl
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -11,7 +11,7 @@ LIBDAEMON_AUTORECONF:=no
 LIBDAEMON_INSTALL_STAGING:=YES
 LIBDAEMON_INSTALL_TARGET:=YES
 LIBDAEMON_CONF_ENV:=ac_cv_func_setpgrp_void=no
-LIBDAEMON_CONF_OPT:=--disable-lynx 
+LIBDAEMON_CONF_OPT:=--disable-lynx $(DISABLE_NLS) $(DISABLE_LARGEFILE)

 LIBDAEMON_DEPENDENCIES:=uclibc pkgconfig

--- a/package/libeXosip2/Config.in
+++ b/package/libeXosip2/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBEXOSIP2
 	bool "libeXosip2"
-	select BR2_PACKAGE_LIBOSIP2
 	help
 	  GNU Higher level SIP (Session Initiation Protocol)
 	  This library aims to provide multimedia and telecom software
--- a/package/libglib12/libglib-libtool.patch
+++ b/package/libglib12/libglib-libtool.patch
@@ -1,88 +0,0 @@
--- glib/ltconfig
-+++ glib/ltconfig
-@@ -450,6 +450,7 @@
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case "$host_os" in
- linux-gnu*) ;;
-+linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1981,6 +1982,28 @@
-   fi
-   ;;
- 
-+linux-uclibc*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # deplibs_check_method=pass_all
-+  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /lib/libuClibc-*.so`
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  # Note: copied from linux-gnu, and may not be appropriate.
-+  hardcode_into_libs=yes
-+  # Assume using the uClibc dynamic linker.
-+  dynamic_linker="uClibc ld.so"
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--- g/configure
-+++ g/configure
-@@ -966,6 +966,7 @@
- host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$host" 1>&6
-+host_alias=$host
- 
- echo $ac_n "checking build system type""... $ac_c" 1>&6
- echo "configure:972: checking build system type" >&5
-diff -urN glib-1.2.10-0rig/ltconfig glib-1.2.10/ltconfig
--- glib-1.2.10-0rig/ltconfig	2009-01-17 02:56:10.000000000 +0100
-+++ glib-1.2.10/ltconfig	2009-01-17 02:55:40.000000000 +0100
-@@ -448,6 +448,9 @@
- fi
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-+echo $ac_n "host_os... $host_os" 1>&5
-+echo $ac_n "host_os... $host_os" 1>&6
-+
- case "$host_os" in
- linux-gnu*) ;;
- linux-uclibc*) ;;
-@@ -761,6 +764,7 @@
-     ;;
-   *)
-     can_build_shared=no
-+    echo "$progname:764: No OS found: host_os = $host_os" >&5
-     ;;
-   esac
- fi
-@@ -1791,6 +1795,8 @@
- # If you have `file' or equivalent on your system and you're not sure
- # whether `pass_all' will *always* work, you probably want this one.
- echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-+echo $ac_n "host_os... $host_os" 1>&5
-+echo $ac_n "host_os... $host_os" 1>&6
- case "$host_os" in
- aix3*)
-   version_type=linux
-@@ -1982,7 +1988,7 @@
-   fi
-   ;;
- 
-linux-uclibc*)
-+*-linux | linux-uclibc*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
--- a/package/libglib12/libglib-libtool.patch.bz2
+++ b/package/libglib12/libglib-libtool.patch.bz2
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -3,12 +3,9 @@
 # libglib2
 #
 #############################################################
-LIBGLIB2_VERSION_MAJOR = 2.16
-LIBGLIB2_VERSION_MINOR = 6
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
+LIBGLIB2_VERSION = 2.16.6
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
-LIBGLIB2_SITE = http://ftp.gtk.org/pub/glib/$(LIBGLIB2_VERSION_MAJOR)
-
+LIBGLIB2_SITE = http://ftp.gtk.org/pub/glib/2.16
 LIBGLIB2_AUTORECONF = NO
 LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_TARGET = YES
@@ -48,6 +45,8 @@ LIBGLIB2_CONF_ENV =	\
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)

 LIBGLIB2_CONF_OPT = --enable-shared \
+	 	--disable-gtk-doc \
+		--with-html-dir=/dev/null \
 		--enable-static

 LIBGLIB2_DEPENDENCIES = uclibc gettext libintl pkgconfig
@@ -56,9 +55,4 @@ ifneq ($(BR2_ENABLE_LOCALE),y)
 LIBGLIB2_DEPENDENCIES+=libiconv
 endif

-ifeq ($(BR2_PACKAGE_LIBICONV),y)
-LIBGLIB2_CONF_OPT += --with-libiconv=gnu
-LIBGLIB2_DEPENDENCIES+=libiconv
-endif
-
 $(eval $(call AUTOTARGETS,package,libglib2))
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -3,13 +3,9 @@
 # libgtk2.0
 #
 #############################################################
-#LIBGTK2_VERSION = 2.15.0
-LIBGTK2_VERSION_MAJOR:=2.12
-LIBGTK2_VERSION_MINOR:=12
-LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
-
+LIBGTK2_VERSION = 2.12.12
 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2
-LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/$(LIBGTK2_VERSION_MAJOR)
+LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/2.12
 LIBGTK2_AUTORECONF = NO
 LIBGTK2_INSTALL_STAGING = YES
 LIBGTK2_INSTALL_TARGET = YES
@@ -79,6 +75,7 @@ LIBGTK2_CONF_OPT = --enable-shared \
 		--disable-glibtest \
 		--enable-explicit-deps=no \
 		--disable-debug \
+		$(DISABLE_LARGEFILE) \
 		$(LIBGTK2_CONF_OPT_X)  \
 		$(LIBGTK2_CONF_OPT_DFB)

@@ -100,10 +97,6 @@ else
 	LIBGTK2_CONF_OPT += --without-x
 endif

-# Buildroot does not support JPEG2000 library
-ifeq ($(LIBGTK2_VERSION_MAJOR),2.15)
-LIBGTK2_CONF_OPT += --without-libjasper
-endif

 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 LIBGTK2_DEPENDENCIES += libpng
--- a/package/liboil/liboil-vfp.patch
+++ b/package/liboil/liboil-vfp.patch
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 06a0ac9..b8d1640 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -158,7 +158,10 @@ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_POWERPC = xyes ; then
-     true)
- fi
- 
-if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then
-+AC_ARG_ENABLE(vfp,
-+  AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]),
-+  enable_vfp=$enableval,enable_vfp=yes)
-+if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
-   AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"],
-     [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfpu=vfp"],
-     true)
--- a/package/liboil/liboil.mk
+++ b/package/liboil/liboil.mk
@@ -6,7 +6,7 @@
 LIBOIL_VERSION = 0.3.15
 LIBOIL_SOURCE = liboil-$(LIBOIL_VERSION).tar.gz
 LIBOIL_SITE = http://liboil.freedesktop.org/download
-LIBOIL_AUTORECONF = YES
+LIBOIL_AUTORECONF = NO
 LIBOIL_INSTALL_STAGING = YES
 LIBOIL_INSTALL_TARGET = YES

@@ -30,10 +30,6 @@ ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
 LIBOIL_GLIB_DEP = libglib2
 endif

-ifeq ($(BR2_VFP_FLOAT),y)
-LIBOIL_CONF_OPT+=--enable-vfp
-endif
-
 LIBOIL_DEPENDENCIES = uclibc $(LIBOIL_GLIB_DEP)

 $(eval $(call AUTOTARGETS,package,liboil))
@@ -41,4 +37,4 @@ $(eval $(call AUTOTARGETS,package,liboil))
 $(LIBOIL_HOOK_POST_INSTALL):
 	# Remove useless bugreport program from the target
 	rm -f $(TARGET_DIR)/usr/bin/oil-bugreport
-	touch $@
+	touch $@
--- a/package/libsexy/Config.in
+++ b/package/libsexy/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBSEXY
 	bool "libsexy"
 	depends on BR2_PACKAGE_LIBGTK2
-	depends on !BR2_PACKAGE_XSERVER_none
 	help
 	  libsexy is a collection of GTK+ widgets that extend the
 	  functionality of such standard widgets as GtkEntry and
@@ -9,7 +8,3 @@ config BR2_PACKAGE_LIBSEXY
 	  limitations of the widgets.

 	  http://www.chipx86.com/wiki/Libsexy
-
-comment "libsexy       - disabled (requires X-Windows)"
-	depends on BR2_PACKAGE_XSERVER_none
-
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -16,7 +16,7 @@ endif
 LIBXML2_CONF_OPT = --with-gnu-ld --enable-shared \
 		--enable-static $(DISABLE_IPV6) \
 		--without-debugging --without-python \
-		--without-threads 
+		--without-threads $(DISABLE_NLS)

 LIBXML2_DEPENDENCIES = uclibc

--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -38,11 +38,11 @@ $(LSOF_DIR)/.configured: $(LSOF_DIR)/.unpacked
 	touch $(LSOF_DIR)/.configured

 $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY): $(LSOF_DIR)/.configured
-ifeq ($(BR2_USE_WCHAR),)
+ifeq ($(UCLIBC_HAS_WCHAR),)
 	$(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h
 	$(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h
 endif
-ifeq ($(BR2_ENABLE_LOCALE),)
+ifeq ($(UCLIBC_HAS_LOCALE),)
 	$(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h
 endif
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -3,7 +3,7 @@
 # lzma
 #
 #############################################################
-LZMA_VERSION:=4.32.6
+LZMA_VERSION:=4.32.4
 LZMA_SOURCE:=lzma-$(LZMA_VERSION).tar.gz
 LZMA_CAT:=$(ZCAT)
 LZMA_SITE:=http://tukaani.org/lzma/
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -11,6 +11,7 @@ LZO_INSTALL_STAGING = YES
 LZO_INSTALL_TARGET = YES
 LZO_INSTALL_STAGING_OPT = CC="$(TARGET_CC)" DESTDIR=$(STAGING_DIR) install
 LZO_CONF_ENV =
+LZO_CONF_OPT = $(DISABLE_LARGEFILE)
 LZO_DEPENDENCIES = uclibc

 $(eval $(call AUTOTARGETS,package,lzo))
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -15,7 +15,7 @@ M4_TARGET_BINARY:=usr/bin/m4
 ifeq ($(UCLIBC_HAS_REGEX),y)
 gl_cv_func_re_compile_pattern_working=gl_cv_func_re_compile_pattern_working=yes
 endif
-ifneq ($(BR2_USE_WCHAR),y)
+ifneq ($(UCLIBC_HAS_WCHAR),y)
 gt_cv_c_wchar_t=gt_cv_c_wchar_t=no
 gl_cv_absolute_wchar_h=gl_cv_absolute_wchar_h=__fpending.h
 endif
--- a/package/mtd/mtd-utils/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch
+++ b/package/mtd/mtd-utils/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch
@@ -1,23 +0,0 @@
-mkfs.jffs2.c: fix device_table handling
-
-find_filesystem_entry would ignore device_table entries for existing elements
-if the device type / permissions weren't exactly the same, effectively
-rendering device_table useless.
---
- mkfs.jffs2.c |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-Index: mtd-utils-1.1.0/mkfs.jffs2.c
-===================================================================
--- mtd-utils-1.1.0.orig/mkfs.jffs2.c
-+++ mtd-utils-1.1.0/mkfs.jffs2.c
-@@ -246,8 +246,7 @@
- 		e = dir->files;
- 	}
- 	while (e) {
-		/* Only bother to do the expensive strcmp on matching file types */
-		if (type == (e->sb.st_mode & S_IFMT)) {
-+		if (1) {
- 			if (S_ISDIR(e->sb.st_mode)) {
- 				int len = strlen(e->fullname);
- 
--- a/package/mtd/mtd-utils/mtd-utils-1.1.0-target-acl.patch
+++ b/package/mtd/mtd-utils/mtd-utils-1.1.0-target-acl.patch
--- a/package/multimedia/alsa-lib/Config.in
+++ b/package/multimedia/alsa-lib/Config.in
@@ -5,14 +5,3 @@ config BR2_PACKAGE_ALSA_LIB
 	  functionality to the Linux operating system.

 	  http://www.alsa-project.org/
-
-config BR2_PACKAGE_ALSA_LIB_PYTHON
-	bool "Python support for alsa-lib"
-	depends on BR2_PACKAGE_ALSA_LIB
-	select BR2_PACKAGE_PYTHON
-	help
-	  Add python support for alsa-lib.
-	  Python will be built and libpython will be installed
-	  in the target directory
-	  http://www.alsa-project.org/
-
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -17,9 +17,8 @@ else
 ALSA_LIB_ABI:=
 endif

-ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON),y)
 ALSA_LIB_CONFIGURE_OPTS += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR)
-ALSA_LIB_DEPS = libpython
 else
 ALSA_LIB_CONFIGURE_OPTS += --disable-python
 endif
@@ -75,7 +74,7 @@ $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/alsa-lib/smixer/*.so
 	touch -c $@

-alsa-lib: uclibc $(ALSA_LIB_DEPS) $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)
+alsa-lib: uclibc $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)

 alsa-lib-source: $(DL_DIR)/$(ALSA-LIB_SOURCE)

--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.arm
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.arm
@@ -1,29 +0,0 @@
-When configuring alsa-utils, it will use the hosts <ncurses.h>
-See: alsa-utils <VERSION> / alsamixer/.deps/alsamicer.Po
-This will, on OpenSuSE 11.0, and possibly other distributions
-result in that the preprocessor directive:
-#define acs_map _nc_acs_map
-which is present in the Buildroot build of ncurses,
-is not executed, and the
-extern <chartype> acs_map[]; 
-declaration in the host ncurses will
-result in an undefined symbol: acs_map.
-
-This patches give up trying to force alsa-utils to use the correct
-ncurses, and just defines a byte with the needed symbol.
-
-
-diff -urN alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c alsa-utils-1.0.18/alsamixer/alsamixer.c
--- alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c	2008-10-29 13:42:11.000000000 +0100
-+++ alsa-utils-1.0.18/alsamixer/alsamixer.c	2009-01-22 23:35:29.000000000 +0100
-@@ -115,6 +115,10 @@
- #include <sys/time.h>
- 
- #include <locale.h>
-+/* Ugly hack to get rid of undefined "acs_map" */
-+/* This is caused by configure using host ncurses.h */
-+/* instead of buildroot's ncurses.h */
-+unsigned long acs_map[1];
- 
- #ifndef CURSESINC
- #include <ncurses.h>
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.avr32
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.avr32
@@ -1,29 +0,0 @@
-When configuring alsa-utils, it will use the hosts <ncurses.h>
-See: alsa-utils <VERSION> / alsamixer/.deps/alsamicer.Po
-This will, on OpenSuSE 11.0, and possibly other distributions
-result in that the preprocessor directive:
-#define acs_map _nc_acs_map
-which is present in the Buildroot build of ncurses,
-is not executed, and the
-extern <chartype> acs_map[]; 
-declaration in the host ncurses will
-result in an undefined symbol: acs_map.
-
-This patches give up trying to force alsa-utils to use the correct
-ncurses, and just defines a byte with the needed symbol.
-
-
-diff -urN alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c alsa-utils-1.0.18/alsamixer/alsamixer.c
--- alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c	2008-10-29 13:42:11.000000000 +0100
-+++ alsa-utils-1.0.18/alsamixer/alsamixer.c	2009-01-22 23:35:29.000000000 +0100
-@@ -115,6 +115,10 @@
- #include <sys/time.h>
- 
- #include <locale.h>
-+/* Ugly hack to get rid of undefined "acs_map" */
-+/* This is caused by configure using host ncurses.h */
-+/* instead of buildroot's ncurses.h */
-+unsigned long acs_map[1];
- 
- #ifndef CURSESINC
- #include <ncurses.h>
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix_sysv_legacy.patch
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix_sysv_legacy.patch
@@ -1,20 +0,0 @@
--- a/alsactl/init_parse.c	2009-01-15 10:44:48.000000000 +0000
-+++ b/alsactl/init_parse.c	2009-01-15 10:46:41.000000000 +0000
-@@ -381,7 +381,7 @@ static int set_ctl_value(struct space *s
- 				snd_ctl_elem_value_set_integer(space->ctl_value, idx, val);
- 			} else if (items > 2 && value[items-2] == 'd' && value[items-1] == 'B') {
- 				val = strtol(value, NULL, 0) * 100;
-				if ((pos2 = index(value, '.')) != NULL) {
-+				if ((pos2 = strchr(value, '.')) != NULL) {
- 					if (isdigit(*(pos2-1)) && isdigit(*(pos2-2))) {
- 						if (val < 0)
- 							val -= strtol(pos2 + 1, NULL, 0);
-@@ -1253,7 +1253,7 @@ static char *new_root_dir(const char *fi
- 
- 	res = strdup(filename);
- 	if (res) {
-		tmp = rindex(res, '/');
-+		tmp = strrchr(res, '/');
- 		if (tmp)
- 			*tmp = '\0';
- 	}
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-remove_man.patch
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.18-remove_man.patch
@@ -1,11 +0,0 @@
--- a/alsactl/Makefile.in	2009-01-15 10:59:38.000000000 +0000
-+++ b/alsactl/Makefile.in	2009-01-15 10:59:34.000000000 +0000
-@@ -204,7 +204,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = init
-man_MANS = alsactl.1 alsactl_init.7
-+man_MANS = alsactl.1
- EXTRA_DIST = alsactl.1 alsactl_init.xml
- alsactl_SOURCES = alsactl.c state.c utils.c init_parse.c
- noinst_HEADERS = alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -16,8 +16,7 @@ $(DL_DIR)/$(ALSA_UTILS_SOURCE):

 $(ALSA_UTILS_DIR)/.unpacked: $(DL_DIR)/$(ALSA_UTILS_SOURCE)
 	$(ALSA_UTILS_CAT) $(DL_DIR)/$(ALSA_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch
-	toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch.$(ARCH)
+	toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch\*
 	$(CONFIG_UPDATE) $(ALSA_UTILS_DIR)
 	touch $@

@@ -74,8 +73,6 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY

 alsa-utils: uclibc alsa-lib ncurses $(if $(BR2_PACKAGE_LIBINTL),libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY)

-alsa-utils-unpacked: $(ALSA_UTILS_DIR)/.unpacked
-
 alsa-utils-source: $(DL_DIR)/$(ALSA_UTILS_SOURCE)

 alsa-utils-clean:
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -17,7 +17,9 @@ GST_PLUGINS_BASE_CONF_OPT = \
 		--disable-xshm \
 		--disable-oggtest \
 		--disable-vorbistest \
-		--disable-freetypetest
+		--disable-freetypetest \
+		--disable-gtk-doc \
+		--without-html-dir

 GST_PLUGINS_BASE_DEPENDENCIES = gstreamer liboil

--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -10,30 +10,6 @@ menuconfig BR2_PACKAGE_GST_PLUGINS_GOOD

 if BR2_PACKAGE_GST_PLUGINS_GOOD

-config BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG
-	bool "jpeg (JPEG support)"
-	select BR2_PACKAGE_JPEG
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PNG
-	bool "png (PNG support)"
-	select BR2_PACKAGE_LIBPNG
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2
-	bool "bz2 support"
-	depends on BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA
-	select BR2_PACKAGE_BZIP2
-	help
-	  Enable bz2 support for the following plugins:
-	  matroska
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB
-	bool "zlib support"
-	depends on BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_QTDEMUX || BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX || BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA
-	select BR2_PACKAGE_ZLIB
-	help
-	  Enable zlib support for the following plugins:
-	  id3demux, qtdemux, matroska
-
 comment "dependency-less plugins"

 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER
@@ -143,13 +119,4 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE
 	bool "wavparse (*.wav audio)"
 	default y

-comment "plugins with external dependencies"
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX
-	bool "annodex (XML Library)"
-	select BR2_PACKAGE_LIBXML2
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS
-	bool "ossaudio (OSS audio)"
-
 endif
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -23,38 +23,11 @@ GST_PLUGINS_GOOD_CONF_OPT = \
 		--disable-esdtest \
 		--disable-shout2 \
 		--disable-shout2test \
-		--disable-esd 
+		--disable-gtk-doc \
+		--without-html-dir

 GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base

-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
-GST_PLUGINS_GOOD_DEPENDENCIES += jpeg
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-jpeg
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PNG),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-libpng
-GST_PLUGINS_GOOD_DEPENDENCIES += libpng
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-libpng
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-bz2
-GST_PLUGINS_GOOD_DEPENDENCIES += bzip2
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-bz2
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-zlib
-GST_PLUGINS_GOOD_DEPENDENCIES += zlib
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-zlib
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-videofilter
 else
@@ -171,7 +144,6 @@ endif

 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-matroska
-GST_PLUGINS_GOOD_DEPENDENCIES += zlib bzip2
 else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-matroska
 endif
@@ -266,17 +238,4 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-wavparse
 endif

-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-annodex
-GST_PLUGINS_GOOD_DEPENDENCIES += libxml2
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-annodex
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-oss
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-oss
-endif
-
 $(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-good))
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -9,7 +9,9 @@ GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly

 GST_PLUGINS_UGLY_CONF_OPT = \
 		$(DISABLE_NLS) \
-		--disable-examples
+		--disable-examples \
+		--disable-gtk-doc \
+		--without-html-dir

 GST_PLUGINS_UGLY_DEPENDENCIES = gstreamer gst-plugins-base

--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -19,9 +19,13 @@ GSTREAMER_CONF_ENV = as_cv_unaligned_access=no
 endif

 GSTREAMER_CONF_OPT = \
+		$(DISABLE_NLS) \
+		$(DISABLE_LARGEFILE) \
 		--disable-examples \
 		--disable-tests \
-		--disable-failing-tests
+		--disable-failing-tests \
+		--disable-gtk-doc \
+		--without-html-dir

 GSTREAMER_DEPENDENCIES = libglib2 libxml2 pkgconfig

--- a/package/multimedia/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch
+++ b/package/multimedia/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch
@@ -1,33 +0,0 @@
-libmad: remove deprecated cflags (-fforce-mem)
-
-fforce-mem has long been deprecated, and is completely removed from
-gcc 4.3.x on.
---
- configure    |    1 -
- configure.ac |    1 -
- 2 files changed, 2 deletions(-)
-
-Index: libmad-0.15.1b/configure.ac
-===================================================================
--- libmad-0.15.1b.orig/configure.ac
-+++ libmad-0.15.1b/configure.ac
-@@ -140,7 +140,6 @@
-     case "$optimize" in
- 	-O|"-O "*)
- 	    optimize="-O"
-	    optimize="$optimize -fforce-mem"
- 	    optimize="$optimize -fforce-addr"
- 	    : #x optimize="$optimize -finline-functions"
- 	    : #- optimize="$optimize -fstrength-reduce"
-Index: libmad-0.15.1b/configure
-===================================================================
--- libmad-0.15.1b.orig/configure
-+++ libmad-0.15.1b/configure
-@@ -19099,7 +19099,6 @@
-     case "$optimize" in
- 	-O|"-O "*)
- 	    optimize="-O"
-	    optimize="$optimize -fforce-mem"
- 	    optimize="$optimize -fforce-addr"
- 	    : #x optimize="$optimize -finline-functions"
- 	    : #- optimize="$optimize -fstrength-reduce"
--- a/package/multimedia/mplayer/mplayer-1.0rc1-atmel.3.patch
+++ b/package/multimedia/mplayer/mplayer-1.0rc1-atmel.3.patch
@@ -33,6 +33,8 @@
 create mode 100644 libswscale/pico-avr32.h
 create mode 100644 libswscale/yuv2rgb_avr32.c

+diff --git a/cfg-common.h b/cfg-common.h
+index 780df38..7d878a8 100644
 --- a/cfg-common.h
 +++ b/cfg-common.h
@@ -235,6 +235,10 @@
@@ -46,6 +48,8 @@
 	// draw by slices or whole frame (useful with libmpeg2/libavcodec)
 	{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+diff --git a/cfg-mencoder.h b/cfg-mencoder.h
+index 411b748..addf791 100644
 --- a/cfg-mencoder.h
 +++ b/cfg-mencoder.h
@@ -5,6 +5,10 @@
@@ -59,6 +63,8 @@
 #ifdef USE_FAKE_MONO
 extern int fakemono; // defined in dec_audio.c
 #endif
+diff --git a/cfg-mplayer.h b/cfg-mplayer.h
+index 62b6eac..31499c2 100644
 --- a/cfg-mplayer.h
 +++ b/cfg-mplayer.h
@@ -4,6 +4,10 @@
@@ -72,6 +78,8 @@
 extern int noconsolecontrols;
 
 #if defined(HAVE_FBDEV)||defined(HAVE_VESA)
+diff --git a/configure b/configure
+index 29002c8..56c6fe4 100755
 --- a/configure
 +++ b/configure
@@ -1203,6 +1203,15 @@ EOF
@@ -108,6 +116,8 @@
     if test -f "$I/X11/Xlib.h" ; then
       _inc_x11="-I$I"
       _x11_headers="yes"
+diff --git a/libaf/af_format.c b/libaf/af_format.c
+index e5b7cc9..5d7ea6d 100644
 --- a/libaf/af_format.c
 +++ b/libaf/af_format.c
@@ -20,7 +20,14 @@
@@ -125,9 +135,11 @@
 #else
 #define lrintf(x) ((int)(x))
 #endif
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index 17b6c45..8e1dc96 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
-@@ -360,6 +360,12 @@ OBJS-$(TARGET_ARCH_SPARC)              +
+@@ -360,6 +360,12 @@ OBJS-$(TARGET_ARCH_SPARC)              += sparc/dsputil_vis.o \
 
 sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
 
@@ -148,6 +160,9 @@
 	   armv4l/*.o armv4l/*~ \
 	   mlib/*.o mlib/*~ \
 	   alpha/*.o alpha/*~ \
+diff --git a/libavcodec/avr32/dsputil_avr32.c b/libavcodec/avr32/dsputil_avr32.c
+new file mode 100644
+index 0000000..200284d
 --- /dev/null
 +++ b/libavcodec/avr32/dsputil_avr32.c
@@ -0,0 +1,2678 @@
@@ -2829,6 +2844,9 @@
 +}
 +#endif
 +
+diff --git a/libavcodec/avr32/fdct.S b/libavcodec/avr32/fdct.S
+new file mode 100644
+index 0000000..be45b86
 --- /dev/null
 +++ b/libavcodec/avr32/fdct.S
@@ -0,0 +1,541 @@
@@ -3373,6 +3391,9 @@
 +
 +
 +
+diff --git a/libavcodec/avr32/h264idct.S b/libavcodec/avr32/h264idct.S
+new file mode 100644
+index 0000000..4b23e2d
 --- /dev/null
 +++ b/libavcodec/avr32/h264idct.S
@@ -0,0 +1,451 @@
@@ -3827,6 +3848,9 @@
 +		
 +//    }
 +//}
+diff --git a/libavcodec/avr32/idct.S b/libavcodec/avr32/idct.S
+new file mode 100644
+index 0000000..e7551ec
 --- /dev/null
 +++ b/libavcodec/avr32/idct.S
@@ -0,0 +1,829 @@
@@ -4659,6 +4683,9 @@
 +	.short	- FIX_1_961570560, - FIX_0_390180644, FIX_0_298631336, FIX_2_053119869
 +	.short	FIX_3_072711026, FIX_1_501321110, - FIX_0_899976223, - FIX_2_562915447
 +	
+diff --git a/libavcodec/avr32/mc.S b/libavcodec/avr32/mc.S
+new file mode 100644
+index 0000000..07a002d
 --- /dev/null
 +++ b/libavcodec/avr32/mc.S
@@ -0,0 +1,434 @@
@@ -5096,6 +5123,9 @@
 +avg_pixels8_avr32:
 +avg_no_rnd_pixels8_avr32:
 +	pixels8	0	
+diff --git a/libavcodec/avr32/pico.h b/libavcodec/avr32/pico.h
+new file mode 100644
+index 0000000..32201ba
 --- /dev/null
 +++ b/libavcodec/avr32/pico.h
@@ -0,0 +1,260 @@
@@ -5359,6 +5389,8 @@
 +
 +#endif
 +
+diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
+index 26b4f8d..1f8fabf 100644
 --- a/libavcodec/bitstream.h
 +++ b/libavcodec/bitstream.h
@@ -171,7 +171,7 @@ typedef struct RL_VLC_ELEM {
@@ -5481,9 +5513,11 @@
 
 /**
  * parses a vlc code, faster then get_vlc()
+diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
+index 56c42b9..8fc10c6 100644
 --- a/libavcodec/dsputil.c
 +++ b/libavcodec/dsputil.c
-@@ -4197,6 +4197,9 @@ void dsputil_init(DSPContext* c, AVCodec
+@@ -4197,6 +4197,9 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
 #ifdef ARCH_BFIN
     dsputil_init_bfin(c,avctx);
 #endif
@@ -5493,6 +5527,8 @@
 
     for(i=0; i<64; i++){
         if(!c->put_2tap_qpel_pixels_tab[0][i])
+diff --git a/libavcodec/h264.c b/libavcodec/h264.c
+index 865e80a..8f7c3f1 100644
 --- a/libavcodec/h264.c
 +++ b/libavcodec/h264.c
@@ -3258,7 +3258,12 @@ static void free_tables(H264Context *h){
@@ -5508,7 +5544,7 @@
     h->dequant8_coeff[0] = h->dequant8_buffer[0];
     h->dequant8_coeff[1] = h->dequant8_buffer[1];
 
-@@ -3281,7 +3286,13 @@ static void init_dequant8_coeff_table(H2
+@@ -3281,7 +3286,13 @@ static void init_dequant8_coeff_table(H264Context *h){
 
 static void init_dequant4_coeff_table(H264Context *h){
     int i,j,q,x;
@@ -5522,7 +5558,7 @@
     for(i=0; i<6; i++ ){
         h->dequant4_coeff[i] = h->dequant4_buffer[i];
         for(j=0; j<i; j++){
-@@ -4663,7 +4674,11 @@ static int decode_slice_header(H264Conte
+@@ -4663,7 +4674,11 @@ static int decode_slice_header(H264Context *h){
         if (MPV_common_init(s) < 0)
             return -1;
 
@@ -5534,9 +5570,11 @@
             memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t));
             memcpy(h-> field_scan,  field_scan, 16*sizeof(uint8_t));
         }else{
+diff --git a/libavutil/common.h b/libavutil/common.h
+index 3ae5971..7e52b90 100644
 --- a/libavutil/common.h
 +++ b/libavutil/common.h
-@@ -283,23 +283,39 @@ static inline int mid_pred(int a, int b,
+@@ -283,23 +283,39 @@ static inline int mid_pred(int a, int b, int c)
  * @param amax maximum value of the clip range
  * @return cliped value
  */
@@ -5576,6 +5614,8 @@
 
 /* math */
 int64_t ff_gcd(int64_t a, int64_t b);
+diff --git a/libavutil/internal.h b/libavutil/internal.h
+index 285d304..a8b0718 100644
 --- a/libavutil/internal.h
 +++ b/libavutil/internal.h
@@ -210,6 +210,15 @@ if((y)<(x)){\
@@ -5594,6 +5634,8 @@
 #ifndef HAVE_LRINTF
 /* XXX: add ISOC specific test to avoid specific BSD testing. */
 /* better than nothing implementation. */
+diff --git a/libfaad2/common.h b/libfaad2/common.h
+index f809042..6c5fb21 100644
 --- a/libfaad2/common.h
 +++ b/libfaad2/common.h
@@ -67,7 +67,7 @@ extern "C" {
@@ -5605,6 +5647,8 @@
 #define FIXED_POINT
 #endif
 
+diff --git a/libmpcodecs/ad_libmad.c b/libmpcodecs/ad_libmad.c
+index 076359a..51b77fe 100644
 --- a/libmpcodecs/ad_libmad.c
 +++ b/libmpcodecs/ad_libmad.c
@@ -86,6 +86,11 @@ static int init(sh_audio_t *sh){
@@ -5619,6 +5663,9 @@
   sh->samplesize=2;
   
   return 1;
+diff --git a/libswscale/pico-avr32.h b/libswscale/pico-avr32.h
+new file mode 100644
+index 0000000..7ac6200
 --- /dev/null
 +++ b/libswscale/pico-avr32.h
@@ -0,0 +1,137 @@
@@ -5759,6 +5806,8 @@
 +
 +#endif
 +
+diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
+index ecd28f5..3221d0c 100644
 --- a/libswscale/swscale_internal.h
 +++ b/libswscale/swscale_internal.h
@@ -173,7 +173,7 @@ typedef struct SwsContext{
@@ -5770,6 +5819,8 @@
 
 //FIXME replace this with something faster
 #define isPlanarYUV(x) ((x)==PIX_FMT_YUV410P || (x)==PIX_FMT_YUV420P	\
+diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
+index 71759bc..fa83985 100644
 --- a/libswscale/yuv2rgb.c
 +++ b/libswscale/yuv2rgb.c
@@ -44,6 +44,10 @@
@@ -5783,7 +5834,7 @@
 #define DITHER1XBPP // only for mmx
 
 const uint8_t  __attribute__((aligned(8))) dither_2x2_4[2][8]={
-@@ -601,6 +605,12 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext
+@@ -601,6 +605,12 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext *c)
 	if(t) return t;
     }
 #endif
@@ -5796,7 +5847,7 @@
 #ifdef HAVE_ALTIVEC
     if (c->flags & SWS_CPU_CAPS_ALTIVEC)
     {
-@@ -678,6 +688,10 @@ int yuv2rgb_c_init_tables (SwsContext *c
+@@ -678,6 +688,10 @@ int yuv2rgb_c_init_tables (SwsContext *c, const int inv_table[4], int fullRange,
 //printf("%lld %lld %lld %lld %lld\n", cy, crv, cbu, cgu, cgv);
     oy -= 256*brightness;
 
@@ -5807,6 +5858,9 @@
     for (i = 0; i < 1024; i++) {
 	int j;
 
+diff --git a/libswscale/yuv2rgb_avr32.c b/libswscale/yuv2rgb_avr32.c
+new file mode 100644
+index 0000000..4a8341e
 --- /dev/null
 +++ b/libswscale/yuv2rgb_avr32.c
@@ -0,0 +1,416 @@
@@ -6226,6 +6280,8 @@
 +
 +
 +#undef RGB
+diff --git a/libvo/vo_fbdev2.c b/libvo/vo_fbdev2.c
+index 053c193..7017770 100644
 --- a/libvo/vo_fbdev2.c
 +++ b/libvo/vo_fbdev2.c
@@ -22,6 +22,9 @@
@@ -6254,7 +6310,7 @@
 	fb_bpp = fb_vinfo.bits_per_pixel;
 
 	/* 16 and 15 bpp is reported as 16 bpp */
-@@ -289,6 +301,10 @@ static int config(uint32_t width, uint32
+@@ -289,6 +301,10 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 		mp_msg(MSGT_VO, MSGL_ERR, "[fbdev2] Can't malloc next_frame: %s\n", strerror(errno));
 		return 1;
 	}
@@ -6367,7 +6423,7 @@
 }
 
 static void uninit(void)
-@@ -403,6 +478,10 @@ static int control(uint32_t request, voi
+@@ -403,6 +478,10 @@ static int control(uint32_t request, void *data, ...)
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
     return query_format(*((uint32_t*)data));
@@ -6378,6 +6434,8 @@
   }
   return VO_NOTIMPL;
 }
+diff --git a/version.sh b/version.sh
+index 44b5c5d..cf22a68 100755
 --- a/version.sh
 +++ b/version.sh
@@ -1,2 +1,2 @@
--- a/package/multimedia/mplayer/mplayer-1.0rc1-fix-alsa-output.patch
+++ b/package/multimedia/mplayer/mplayer-1.0rc1-fix-alsa-output.patch
@@ -1,150 +0,0 @@
--- a/libao2/ao_alsa.c
-+++ b/libao2/ao_alsa.c
-@@ -263,48 +263,49 @@ static int str_maxlen(strarg_t *str) {
-   return 1;
- }
- 
-/* change a PCM definition for correct AC-3 playback */
-static void set_non_audio(snd_config_t *root, const char *name_with_args)
-+static int try_open_device(const char *device, int open_mode, int try_ac3)
- {
-  char *name, *colon, *old_value_str;
-  snd_config_t *config, *args, *aes0, *old_def, *def;
-  int value, err;
-
-  /* strip the parameters from the PCM name */
-  if ((name = strdup(name_with_args)) != NULL) {
-    if ((colon = strchr(name, ':')) != NULL)
-      *colon = '\0';
-    /* search the PCM definition that we'll later use */
-    if (snd_config_search_alias_hooks(root, strchr(name, '.') ? NULL : "pcm",
-				      name, &config) >= 0) {
-      /* does this definition have an "AES0" parameter? */
-      if (snd_config_search(config, "@args", &args) >= 0 &&
-	  snd_config_search(args, "AES0", &aes0) >= 0) {
-	/* read the old default value */
-	value = IEC958_AES0_CON_NOT_COPYRIGHT |
-		IEC958_AES0_CON_EMPHASIS_NONE;
-	if (snd_config_search(aes0, "default", &old_def) >= 0) {
-	  /* don't use snd_config_get_integer() because alsa-lib <= 1.0.12
-	   * parses hex numbers as strings */
-	  if (snd_config_get_ascii(old_def, &old_value_str) >= 0) {
-	    sscanf(old_value_str, "%i", &value);
-	    free(old_value_str);
-	  }
-	} else
-	  old_def = NULL;
-	/* set the non-audio bit */
-	value |= IEC958_AES0_NONAUDIO;
-	/* set the new default value */
-	if (snd_config_imake_integer(&def, "default", value) >= 0) {
-	  if (old_def)
-	    snd_config_substitute(old_def, def);
-	  else
-	    snd_config_add(aes0, def);
-	}
-+  int err, len;
-+  char *ac3_device, *args;
-+
-+  if (try_ac3) {
-+    /* to set the non-audio bit, use AES0=6 */
-+    len = strlen(device);
-+    ac3_device = malloc(len + 7 + 1);
-+    if (!ac3_device)
-+      return -ENOMEM;
-+    strcpy(ac3_device, device);
-+    args = strchr(ac3_device, ':');
-+    if (!args) {
-+      /* no existing parameters: add it behind device name */
-+      strcat(ac3_device, ":AES0=6");
-+    } else {
-+      do
-+	++args;
-+      while (isspace(*args));
-+      if (*args == '\0') {
-+	/* ":" but no parameters */
-+	strcat(ac3_device, "AES0=6");
-+      } else if (*args != '{') {
-+	/* a simple list of parameters: add it at the end of the list */
-+	strcat(ac3_device, ",AES0=6");
-+      } else {
-+	/* parameters in config syntax: add it inside the { } block */
-+	do
-+	  --len;
-+	while (len > 0 && isspace(ac3_device[len]));
-+	if (ac3_device[len] == '}')
-+	  strcpy(ac3_device + len, " AES0=6}");
-       }
-     }
-    free(name);
-+    err = snd_pcm_open(&alsa_handler, ac3_device, SND_PCM_STREAM_PLAYBACK,
-+		       open_mode);
-+    free(ac3_device);
-   }
-+  if (!try_ac3 || err < 0)
-+    err = snd_pcm_open(&alsa_handler, device, SND_PCM_STREAM_PLAYBACK,
-+		       open_mode);
-+  return err;
- }
- 
- /*
-@@ -316,7 +317,6 @@ static int init(int rate_hz, int channel
-     int err;
-     int block;
-     strarg_t device;
-    snd_config_t *my_config;
-     snd_pcm_uframes_t bufsize;
-     snd_pcm_uframes_t boundary;
-     opt_t subopts[] = {
-@@ -496,24 +496,12 @@ static int init(int rate_hz, int channel
-     }
- 
-     if (!alsa_handler) {
-      if ((err = snd_config_update()) < 0) {
-	mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: cannot read ALSA configuration: %s\n", snd_strerror(err));
-	return 0;
-      }
-      if ((err = snd_config_copy(&my_config, snd_config)) < 0) {
-	mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: cannot copy configuration: %s\n", snd_strerror(err));
-	return 0;
-      }
-      if (format == AF_FORMAT_AC3)
-	set_non_audio(my_config, alsa_device);
-       //modes = 0, SND_PCM_NONBLOCK, SND_PCM_ASYNC
-      if ((err = snd_pcm_open_lconf(&alsa_handler, alsa_device,
-				    SND_PCM_STREAM_PLAYBACK, open_mode, my_config)) < 0)
-+      if ((err = try_open_device(alsa_device, open_mode, format == AF_FORMAT_AC3)) < 0)
- 	{
- 	  if (err != -EBUSY && ao_noblock) {
- 	    mp_msg(MSGT_AO,MSGL_INFO,"alsa-init: open in nonblock-mode failed, trying to open in block-mode\n");
-	    if ((err = snd_pcm_open_lconf(&alsa_handler, alsa_device,
-					  SND_PCM_STREAM_PLAYBACK, 0, my_config)) < 0) {
-+	    if ((err = try_open_device(alsa_device, 0, format == AF_FORMAT_AC3)) < 0) {
- 	      mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: playback open error: %s\n", snd_strerror(err));
- 	      return(0);
- 	    }
-@@ -522,12 +510,11 @@ static int init(int rate_hz, int channel
- 	    return(0);
- 	  }
- 	}
-      snd_config_delete(my_config);
- 
-       if ((err = snd_pcm_nonblock(alsa_handler, 0)) < 0) {
-          mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: error set block-mode %s\n", snd_strerror(err));
-       } else {
-	mp_msg(MSGT_AO,MSGL_V,"alsa-init: pcm opend in blocking mode\n");
-+	mp_msg(MSGT_AO,MSGL_V,"alsa-init: pcm opened in blocking mode\n");
-       }
- 
-       snd_pcm_hw_params_alloca(&alsa_hwparams);
-@@ -879,8 +866,8 @@ static int get_space(void)
-     }
-     
-     ret = snd_pcm_status_get_avail(status) * bytes_per_sample;
-    if (ret > MAX_OUTBURST)
-	    ret = MAX_OUTBURST;
-+    if (ret > ao_data.buffersize)  // Buffer underrun?
-+	ret = ao_data.buffersize;
-     return(ret);
- }
- 
--- a/package/multimedia/mplayer/mplayer-1.0rc1-index.patch
+++ b/package/multimedia/mplayer/mplayer-1.0rc1-index.patch
@@ -1,6 +1,7 @@
--- a/stream/stream_dvb.c
-+++ b/stream/stream_dvb.c
-@@ -37,9 +37,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg
+diff -urN MPlayer-1.0rc1-0rig/stream/stream_dvb.c MPlayer-1.0rc1/stream/stream_dvb.c
+--- MPlayer-1.0rc1-0rig/stream/stream_dvb.c	2006-10-23 00:32:25.000000000 +0200
+++ MPlayer-1.0rc1/stream/stream_dvb.c	2007-09-25 08:37:54.000000000 +0200
+@@ -37,9 +37,7 @@
 #include <sys/poll.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -10,7 +11,7 @@
 
 #include "stream.h"
 #include "libmpdemux/demuxer.h"
-@@ -168,7 +166,7 @@ static dvb_channels_list *dvb_get_channe
+@@ -168,7 +166,7 @@
 		if((line[0] == '#') || (strlen(line) == 0))
 			continue;
 
--- a/package/multimedia/mplayer/mplayer-1.0rc1-largefile.patch
+++ b/package/multimedia/mplayer/mplayer-1.0rc1-largefile.patch
@@ -1,18 +0,0 @@
-mplayer: don't unconditionally force largefile support for libraries
---
- common.mak |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: MPlayer-1.0rc1/common.mak
-===================================================================
--- MPlayer-1.0rc1.orig/common.mak
-+++ MPlayer-1.0rc1/common.mak
-@@ -5,7 +5,7 @@
- SRC_DIR = $(SRC_PATH)/lib$(NAME)
- VPATH = $(SRC_DIR)
- 
-CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-+CFLAGS += -DHAVE_AV_CONFIG_H \
-           -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
-           -I$(SRC_PATH)/libavutil $(OPTFLAGS)
- SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
--- a/package/multimedia/mplayer/mplayer-1.0rc1-ppc-configure.patch
+++ b/package/multimedia/mplayer/mplayer-1.0rc1-ppc-configure.patch
@@ -1,27 +0,0 @@
-mplayer: configure: handle target=powerpc-linux as well as ppc-linux
---
- configure |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: MPlayer-1.0rc1/configure
-===================================================================
--- MPlayer-1.0rc1.orig/configure
-+++ MPlayer-1.0rc1/configure
-@@ -133,7 +133,7 @@
- 
- ppc() {
-   case "$host_arch" in
-    ppc) return 0;;
-+    ppc|powerpc) return 0;;
-     *) return 1;;
-   esac
- }
-@@ -1213,7 +1213,7 @@
-     _optimizing=''
-     ;;
- 
-  ppc)
-+  ppc|powerpc)
-     _def_arch='#define ARCH_POWERPC 1'
-     _def_dcbzl='#define NO_DCBZL 1'
-     _target_arch='TARGET_ARCH_POWERPC = yes'
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -17,14 +17,6 @@ else
 MPLAYER_ENDIAN:=--disable-big-endian
 endif

-# mplayer unfortunately uses --disable-largefileS, so we cannot use
-# DISABLE_LARGEFILE
-ifeq ($(BR2_LARGEFILE),y)
-MPLAYER_LARGEFILE:=--enable-largefiles
-else
-MPLAYER_LARGEFILE:=--disable-largefiles
-endif
-
 $(DL_DIR)/$(MPLAYER_SOURCE):
 	$(call DOWNLOAD,$(MPLAYER_SITE),$(MPLAYER_SOURCE))

@@ -53,8 +45,6 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
 		--enable-mad \
 		--enable-fbdev \
 		$(MPLAYER_ENDIAN) \
-		$(MPLAYER_LARGEFILE) \
-		--enable-cross-compile \
 		--disable-mpdvdkit \
 		--disable-ivtv \
 		--disable-tv \
--- a/package/multimedia/speex/speex.mk
+++ b/package/multimedia/speex/speex.mk
@@ -12,7 +12,7 @@ SPEEX_INSTALL_TARGET = YES
 SPEEX_DEPENDENCIES = libogg
 SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \
 		 --with-ogg-includes=$(STAGING_DIR)/usr/include \
-		 --enable-fixed-point 
+		 --enable-fixed-point $(DISABLE_NLS)

 ifeq ($(BR2_PACKAGE_SPEEX_ARM4),y)
 	SPEEX_CONF_OPT += --enable-arm4-asm
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -58,7 +58,7 @@ $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.patched
 		--exec-prefix=/usr \
 		--bindir=/usr/bin \
 		--sbindir=/usr/sbin \
-		--libdir=/usr/lib \
+		--libdir=/lib \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
@@ -82,7 +82,7 @@ $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/.configured
 	$(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \
 		libs panel menu form headers

-$(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+$(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
 	$(MAKE1) \
 	    prefix=$(STAGING_DIR)/usr/ \
 	    exec_prefix=$(STAGING_DIR) \
@@ -92,7 +92,7 @@ $(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libn
 	    datadir=$(STAGING_DIR)/usr/share \
 	    sysconfdir=$(STAGING_DIR)/etc \
 	    localstatedir=$(STAGING_DIR)/var \
-	    libdir=$(STAGING_DIR)/usr/lib \
+	    libdir=$(STAGING_DIR)/lib \
 	    infodir=$(STAGING_DIR)/usr/info \
 	    mandir=$(STAGING_DIR)/usr/man \
 	    includedir=$(STAGING_DIR)/usr/include \
@@ -102,8 +102,8 @@ $(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libn
 	chmod a-x $(NCURSES_DIR)/lib/libncurses.so*
 	touch -c $@

-$(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
-	cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
+$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+	cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
 ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y)
 	cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/
 endif
@@ -143,12 +143,12 @@ $(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
 	 ln -fs libncurses.a libtermcap.a; \
 	)
 	(cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
-	rm -f $(TARGET_DIR)/usr/lib/libncurses.so
-	(cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.so.$(NCURSES_VERSION) libncurses.so)
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
+	rm -f $(TARGET_DIR)/lib/libncurses.so
+	(cd $(TARGET_DIR)/usr/lib; ln -fs ../../lib/libncurses.so.$(NCURSES_VERSION) libncurses.so)
+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
 	touch -c $@

-ncurses: $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
+ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)

 ncurses-unpacked: $(NCURSES_DIR)/.patched

@@ -157,6 +157,7 @@ ncurses-headers: $(TARGET_DIR)/usr/lib/libncurses.a
 ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)

 ncurses-clean:
+	rm -f $(STAGING_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/libncurses.so*
 	rm -f $(STAGING_DIR)/usr/lib/libncurses.so* $(TARGET_DIR)/usr/lib/libncurses.so*
 	rm -rf $(STAGING_DIR)/usr/share/tabset $(TARGET_DIR)/usr/share/tabset
 	rm -rf $(STAGING_DIR)/usr/share/terminfo $(TARGET_DIR)/usr/share/terminfo
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -10,6 +10,7 @@ NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netc
 NETCAT_AUTORECONF:=NO
 NETCAT_INSTALL_STAGING:=NO
 NETCAT_INSTALL_TARGET:=YES
+NETCAT_CONF_OPT:= $(DISABLE_NLS)

 NETCAT_DEPENDENCIES = uclibc

--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -12,6 +12,7 @@ config BR2_PACKAGE_OPENSSL
 config BR2_PACKAGE_OPENSSL_BIN
 	bool "openssl binary"
 	depends on BR2_PACKAGE_OPENSSL
+	default no
 	help
 	  Install the openssl binary to the target file system. This is a
 	  command line tool for doing various crypthographic stuff.
@@ -19,5 +20,6 @@ config BR2_PACKAGE_OPENSSL_BIN
 config BR2_PACKAGE_OPENSSL_ENGINES
 	bool "openssl additional engines"
 	depends on BR2_PACKAGE_OPENSSL
+	default no
 	help
 	  Install additional encryption engine libraries.
--- a/package/openssl/openssl-0.9.8g-dont-force-large-file.patch
+++ b/package/openssl/openssl-0.9.8g-dont-force-large-file.patch
@@ -1,19 +0,0 @@
-[patch]: bss_file.c: don't force largefile mode
---
- crypto/bio/bss_file.c |    3 ---
- 1 file changed, 3 deletions(-)
-
-Index: openssl-0.9.8g/crypto/bio/bss_file.c
-===================================================================
--- openssl-0.9.8g.orig/crypto/bio/bss_file.c
-+++ openssl-0.9.8g/crypto/bio/bss_file.c
-@@ -78,9 +78,6 @@
-  * sequential access of large files without extra "magic" comprise *BSD,
-  * Darwin, IRIX...
-  */
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
- #endif
- 
- #include <stdio.h>
--- a/package/oprofile/oprofile-0.9.4-002-no-query-modules.patch
+++ b/package/oprofile/oprofile-0.9.4-002-no-query-modules.patch
@@ -1,21 +0,0 @@
-diff -urN oprofile-0.9.4-0rig//daemon/liblegacy/opd_kernel.c oprofile-0.9.4/daemon/liblegacy/opd_kernel.c
--- oprofile-0.9.4-0rig//daemon/liblegacy/opd_kernel.c	2005-05-04 04:47:03.000000000 +0200
-+++ oprofile-0.9.4/daemon/liblegacy/opd_kernel.c	2009-01-21 07:40:20.000000000 +0100
-@@ -270,6 +270,9 @@
-  */
- static void opd_drop_module_sample(unsigned long eip)
- {
-+	verbprintf(vmodule, "query_module not available on linux-2.6: %s\n", strerror(EPERM));
-+
-+#if	0
- 	char * module_names;
- 	char * name;
- 	size_t size = 1024;
-@@ -307,6 +310,7 @@
- 
- 	if (module_names)
- 		free(module_names);
-+#endif
- }
- 
- 
--- a/package/oprofile/oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch
+++ b/package/oprofile/oprofile-0.9.4-001-avr32-enable-lookup_dcookie.patch
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -4,11 +4,10 @@
 #
 #############################################################
 OPROFILE_VERSION := 0.9.4
-OPROFILE_CONF_OPT :=	--localstatedir=/var \
-			--with-extra-includes="$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd \
-			-I$(TOOL_BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)/include" \
-			--with-extra-libs=$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd \
-			--with-kernel-support
+OPROFILE_CONF_OPT := --localstatedir=/var \
+		     --with-extra-includes="$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd -I$(TOOL_BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)/include" \
+		     --with-extra-libs=$(BUILD_DIR)/binutils-$(BR2_BINUTILS_VERSION)-target/bfd \
+		     --with-kernel-support

 OPROFILE_BINARIES := utils/ophelp
 OPROFILE_BINARIES += pp/opannotate pp/oparchive pp/opgprof pp/opreport opjitconv/opjitconv
@@ -44,4 +43,3 @@ $(OPROFILE_TARGET_CLEAN):
 	rm -rf $(TARGET_DIR)/usr/share/oprofile
 	-$(MAKE) -C $(OPROFILE_DIR) clean
 	touch $@
-
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -11,7 +11,7 @@ PSMISC_INSTALL_STAGING:=no
 PSMISC_INSTALL_TARGET:=YES
 PSMISC_CONF_ENV:=ac_cv_func_malloc_0_nonnull=yes \
 		 ac_cv_func_realloc_0_nonnull=yes
-PSMISC_CONF_OPT:= $(DISABLE_IPV6)
+PSMISC_CONF_OPT:= $(DISABLE_NLS) $(DISABLE_IPV6)
 PSMISC_DEPENDENCIES:=uclibc ncurses

 ifeq ($(BR2_ENABLE_LOCALE),y)
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -167,41 +167,25 @@ ifneq ($(BR2_PACKAGE_PYTHON_TKINTER),y)
 	rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/lib-tk
 endif

-python: uclibc $(PYTHON_DEPS) $(TARGET_DIR)/$(PYTHON_TARGET_BINARY)
+$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so: $(TARGET_DIR)/$(PYTHON_TARGET_BINARY)
+		cp -dpr $(PYTHON_DIR)/libpython*.so.* $(STAGING_DIR)/usr/lib
+		(\
+		cd $(STAGING_DIR)/usr/lib ; \
+		rm -f libpython$(PYTHON_VERSION_MAJOR).so ; \
+		ln -s `basename  \`ls libpython*.so.*\`` libpython$(PYTHON_VERSION_MAJOR).so \
+		)
+
+libpython:	$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so
+
+python: uclibc $(PYTHON_DEPS) $(TARGET_DIR)/$(PYTHON_TARGET_BINARY) libpython

 python-clean:
 	-$(MAKE) -C $(PYTHON_DIR) distclean
 	rm -f $(PYTHON_DIR)/.configured $(TARGET_DIR)/$(PYTHON_TARGET_BINARY)
 	-rm -rf $(TARGET_DIR)/usr/lib/python* $(TARGET_DIR)/usr/include/python*
-	-rm -f $(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so

 python-dirclean:
 	rm -rf $(PYTHON_DIR)
-
-####  LIBPYTHON
-
-
-LIBPYTHON_BINARY:=libpython$(PYTHON_VERSION_MAJOR).so
-
-libpython:	python $(TARGET_DIR)/usr/lib/$(LIBPYTHON_BINARY)
-
-
-$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so: $(TARGET_DIR)/$(PYTHON_TARGET_BINARY)
-		cp -dpr $(PYTHON_DIR)/$(LIBPYTHON_BINARY).* $(STAGING_DIR)/usr/lib
-		(\
-		cd $(STAGING_DIR)/usr/lib ; \
-		rm -f $(LIBPYTHON_BINARY) ; \
-		ln -s `basename  \`ls libpython*.so.*\`` $(LIBPYTHON_BINARY) \
-		)
-
-$(TARGET_DIR)/usr/lib/$(LIBPYTHON_BINARY): $(STAGING_DIR)/usr/lib/$(LIBPYTHON_BINARY)
-		cp -dpr $(STAGING_DIR)/usr/lib/$(LIBPYTHON_BINARY).* $(TARGET_DIR)/usr/lib
-		(\
-		cd $(TARGET_DIR)/usr/lib ; \
-		rm -f $(LIBPYTHON_BINARY) ; \
-		ln -s `basename  \`ls libpython*.so.*\`` $(LIBPYTHON_BINARY) \
-		)
-
 #############################################################
 #
 # Toplevel Makefile options
--- a/package/raidtools2/Config.in
+++ b/package/raidtools2/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_RAIDTOOLS
+	bool "raidtools2"
+	help
+	  Utilities to support 'old-style' RAID disks.
+
+	  http://people.redhat.com/mingo/raidtools/
--- a/package/raidtools2/raidtools2.mk
+++ b/package/raidtools2/raidtools2.mk
@@ -0,0 +1,70 @@
+#############################################################
+#
+# raidtools2
+#
+#############################################################
+RAIDTOOLS2_VERSION:=1.00.3
+RAIDTOOLS2_SOURCE:=raidtools2-$(RAIDTOOLS2_VERSION).tar.gz
+RAIDTOOLS2_SITE:=
+RAIDTOOLS2_DIR:=$(BUILD_DIR)/raidtools2-$(RAIDTOOLS2_VERSION)
+RAIDTOOLS2_CAT:=$(ZCAT)
+RAIDTOOLS2_BINARY:=mkraid
+RAIDTOOLS2_TARGET_BINARY:=sbin/mkraid
+
+$(DL_DIR)/$(RAIDTOOLS2_SOURCE):
+	$(call DOWNLOAD,$(RAIDTOOLS2_SITE),$(RAIDTOOLS2_SOURCE))
+
+raidtools2-source: $(DL_DIR)/$(RAIDTOOLS2_SOURCE)
+
+$(RAIDTOOLS2_DIR)/.unpacked: $(DL_DIR)/$(RAIDTOOLS2_SOURCE)
+	$(RAIDTOOLS2_CAT) $(DL_DIR)/$(RAIDTOOLS2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(RAIDTOOLS2_DIR)/.unpacked
+
+$(RAIDTOOLS2_DIR)/.configured: $(RAIDTOOLS2_DIR)/.unpacked
+	(cd $(RAIDTOOLS2_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 \
+	        --exec-prefix=/usr \
+	        --bindir=/usr/bin \
+	        --sbindir=/usr/sbin \
+		--libdir=/lib \
+	        --libexecdir=/usr/lib \
+	        --sysconfdir=/etc \
+	        --datadir=/usr/share/misc \
+	        --localstatedir=/var \
+	        --mandir=/usr/man \
+	        --infodir=/usr/info \
+		$(DISABLE_NLS) \
+	        --enable-fsect-man5 \
+	)
+	touch $(RAIDTOOLS2_DIR)/.configured
+
+$(RAIDTOOLS2_DIR)/$(RAIDTOOLS2_BINARY): $(RAIDTOOLS2_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(RAIDTOOLS2_DIR)
+
+$(TARGET_DIR)/$(RAIDTOOLS2_TARGET_BINARY): $(RAIDTOOLS2_DIR)/$(RAIDTOOLS2_BINARY)
+	$(MAKE) ROOTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(RAIDTOOLS2_DIR) install
+	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+
+raidtools2: zlib uclibc $(TARGET_DIR)/$(RAIDTOOLS2_TARGET_BINARY)
+
+raidtools2-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(RAIDTOOLS2_DIR) uninstall
+	-$(MAKE) -C $(RAIDTOOLS2_DIR) clean
+
+raidtools2-dirclean:
+	rm -rf $(RAIDTOOLS2_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_PACKAGE_RAIDTOOLS),y)
+TARGETS+=raidtools2
+endif
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -20,7 +20,8 @@ RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
 	--with-libbeecrypt=$(STAGING_DIR) \
 	--with-popt=$(STAGING_DIR) \
 	--with-mutex=UNIX/fcntl \
-	--with-bzip2
+	--with-bzip2 \
+	$(DISABLE_NLS)

 RPM_MAKE_OPT = -j1

--- a/package/sawman/sawman.mk
+++ b/package/sawman/sawman.mk
@@ -8,11 +8,11 @@ SAWMAN_SOURCE:=SaWMan-$(SAWMAN_VERSION).tar.gz
 SAWMAN_SITE:=http://www.directfb.org/downloads/Extras
 SAWMAN_INSTALL_STAGING = YES
 SAWMAN_INSTALL_TARGET = YES
-# SAWMAN_CONF_ENV = LDFLAGS="-L$(STAGING_DIR)/usr/lib -Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib"
+SAWMAN_CONF_ENV = LDFLAGS="-L$(STAGING_DIR)/usr/lib -Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib"
 ifeq ($(BR2_ENABLE_DEBUG),y)
-SAWMAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+SAWMAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 else
-SAWMAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip
+SAWMAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install-strip
 endif
 SAWMAN_DEPENDENCIES = directfb

--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -75,7 +75,7 @@ $(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked
 ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
 $(SDL_DIRECTFB_TARGET):
 	mkdir -p $(STAGING_DIR)/include
-	ln -s -f ../usr/include/directfb $(SDL_DIRECTFB_TARGET)
+	ln -s ../usr/include/directfb $(SDL_DIRECTFB_TARGET)
 endif

 $(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(SDL_DIRECTFB_TARGET)
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -18,24 +18,24 @@ $(SLANG_DIR): $(DL_DIR)/$(SLANG_SOURCE)
 $(SLANG_DIR)/libslang.so: $(SLANG_DIR)
 	$(MAKE1) CFLAGS="-Os -g -fPIC $(TARGET_CFLAGS)" CC=$(TARGET_CC) -C $(SLANG_DIR)

-$(STAGING_DIR)/usr/lib/libslang.so.1: $(SLANG_DIR)/libslang.so
+$(STAGING_DIR)/lib/libslang.so.1: $(SLANG_DIR)/libslang.so
 	cp -dpf $(SLANG_DIR)/libslang.a $(STAGING_DIR)/usr/lib
-	cp -dpf $(SLANG_DIR)/libslang.so $(STAGING_DIR)/usr/lib
+	cp -dpf $(SLANG_DIR)/libslang.so $(STAGING_DIR)/lib
 	cp -dpf $(SLANG_DIR)/slang.h $(STAGING_DIR)/usr/include
 	cp -dpf $(SLANG_DIR)/slcurses.h $(STAGING_DIR)/usr/include
-	(cd $(STAGING_DIR)/usr/lib; ln -fs libslang.so libslang.so.1)
+	(cd $(STAGING_DIR)/lib; ln -fs libslang.so libslang.so.1)
 	touch -c $@

-$(TARGET_DIR)/usr/lib/libslang.so.1: $(STAGING_DIR)/usr/lib/libslang.so.1
-	cp -dpf $(STAGING_DIR)/usr/lib/libslang.so* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libslang.so*
+$(TARGET_DIR)/lib/libslang.so.1: $(STAGING_DIR)/lib/libslang.so.1
+	cp -dpf $(STAGING_DIR)/lib/libslang.so* $(TARGET_DIR)/lib/
+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libslang.so*

-slang: uclibc $(STAGING_DIR)/usr/lib/libslang.so.1 $(TARGET_DIR)/usr/lib/libslang.so.1
+slang: uclibc $(STAGING_DIR)/lib/libslang.so.1 $(TARGET_DIR)/lib/libslang.so.1

 slang-source: $(DL_DIR)/$(SLANG_SOURCE)

 slang-clean:
-	rm -f $(TARGET_DIR)/usr/lib/libslang.so* $(STAGING_DIR)/usr/lib/libslang.a \
+	rm -f $(TARGET_DIR)/lib/libslang.so* $(STAGING_DIR)/usr/lib/libslang.a \
 		$(STAGING_DIR)/usr/include/slang.h \
 		$(STAGING_DIR)/usr/include/slcurses.h
 	-$(MAKE) -C $(SLANG_DIR) clean
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -1,18 +1,13 @@
 config BR2_PACKAGE_WEBKIT
 	bool "webkit"
+	select BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_ICU
 	select BR2_PACKAGE_CURL
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXSLT
-	select BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_SQLITE
-	depends on !BR2_PACKAGE_XSERVER_none
 	help
 		WebKit is an open source, standards compliant web browser engine.
-		It runs on top of X-Windows

 		http://webkit.org/

-comment "webkit       - disabled (requires X-Windows)"
-	depends on BR2_PACKAGE_XSERVER_none
-
--- a/package/xerces/Config.in
+++ b/package/xerces/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XERCES
-	bool "xerces-c++"
-	select BR2_PACKAGE_LIBICONV
+	bool "xerces"
 	help
 	  Xerces-C++ is a validating XML parser written in portable C++.

--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -3,41 +3,12 @@
 # xerces
 #
 #############################################################
-XERCES_VERSION:=3.0.0
-XERCES_SOURCE:=xerces-c-$(XERCES_VERSION).tar.gz
-XERCES_SITE:=http://apache.jumper.nu/xerces/c/3/sources/
+XERCES_VERSION:=2.7.0
+XERCES_SOURCE:=xerces-c-src_2_7_0.tar.gz
+XERCES_SITE:=http://archive.apache.org/dist/xml/xerces-c/source/
 XERCES_CAT:=$(ZCAT)
-XERCES_DIR:=$(BUILD_DIR)/xerces-c-$(XERCES_VERSION)
-LIBXERCES_BINARY:=libxerces-c-3.0.so
-
-# XERCES-C will install a number of applications
-# in $(STAGING_DIR)/usr/bin
-# We may want to copy these to the target
-
-XERCES_APPS:= \
-	CreateDOMDocument	\
-	DOMCount		\
-	DOMPrint		\
-	EnumVal			\
-	MemParse		\
-	PParse			\
-	PSVIWriter		\
-	Redirect		\
-	SAX2Count		\
-	SAX2Print		\
-	SAXCount		\
-	SAXPrint		\
-	SCMPrint		\
-	SEnumVal		\
-	StdInParse
-
-# XERCES-C installs a 4.2MB worth of "*.hpp" files
-# in the
-#	"dom", "framework", "internal", "parsers",
-#	"sax", "sax2", "util", "validators", "xinclude"
-# directories
-
-XERCES_INCLUDES:=/usr/include/xercesc
+XERCES_DIR:=$(BUILD_DIR)/xerces-c-src_2_7_0
+XERCES_BINARY:=lib/libxerces-c.so.27.0

 $(DL_DIR)/$(XERCES_SOURCE):
 	 $(call DOWNLOAD,$(XERCES_SITE),$(XERCES_SOURCE))
@@ -49,51 +20,30 @@ $(XERCES_DIR)/.unpacked: $(DL_DIR)/$(XERCES_SOURCE)
 # toolchain/patch-kernel.sh $(XERCES_DIR) package/xerces/ \*.patch*
 	touch $(XERCES_DIR)/.unpacked

-#	Support for the following should be added later
-#		--with-curl=
-#		--with-icu=
-#		--with-pkgconfigdir=
-
 $(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked
-	(cd $(XERCES_DIR); rm -rf config.cache; \
+	(cd $(XERCES_DIR)/src/xercesc; rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
-		./configure		\
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr		\
-		--libdir=/usr/lib	\
-		--libexecdir=/usr/lib	\
-		--sysconfdir=/etc	\
-		--localstatedir=/var	\
-		--enable-shared		\
-		--disable-threads	\
-		--disable-network	\
-		--with-gnu-ld		\
+		XERCESCROOT=$(XERCES_DIR) \
+		./runConfigure -plinux -minmem \
+		-nsocket -tnative -rpthread \
+		-c$(TARGET_CC) -x$(TARGET_CXX) \
 	)
-	touch $@
+	touch $(XERCES_DIR)/.configured

-$(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY): $(XERCES_DIR)/.configured
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) LIBS="-liconv" -C $(XERCES_DIR)
+$(XERCES_DIR)/$(XERCES_BINARY): $(XERCES_DIR)/.configured
+	$(MAKE) XERCESCROOT=$(XERCES_DIR) -C $(XERCES_DIR)/src/xercesc

-$(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY): $(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \
-		-C $(XERCES_DIR) install
-	$(INSTALL) -c $(XERCES_DIR)/src/.libs/libxerces-c.lai	\
-		$(STAGING_DIR)/usr/lib/libxerces-c.la
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libxerces-c.la
+$(STAGING_DIR)/$(XERCES_BINARY): $(XERCES_DIR)/$(XERCES_BINARY)
+	$(MAKE) XERCESCROOT=$(XERCES_DIR) PREFIX=$(STAGING_DIR) \
+		-C $(XERCES_DIR)/src/xercesc install

-$(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY): $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)
-	cp -a $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)* $(TARGET_DIR)/usr/lib
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY)
+$(TARGET_DIR)/usr/$(XERCES_BINARY): $(STAGING_DIR)/$(XERCES_BINARY)
+	cp -a $(STAGING_DIR)/lib/libxerces-c.so* $(TARGET_DIR)/usr/lib
+	cp -a $(STAGING_DIR)/lib/libxerces-depdom.so* $(TARGET_DIR)/usr/lib
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxerces-c.so.27.0
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxerces-depdom.so.27.0

-xerces: uclibc $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces-bin: $(XERCES_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces-tbin: $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces-unpacked: $(XERCES_DIR)/.unpacked
+xerces: uclibc $(TARGET_DIR)/usr/$(XERCES_BINARY)

 xerces-clean:
 	rm -rf $(STAGING_DIR)/usr/include/xercesc
--- a/scripts/buildall.sh
+++ b/scripts/buildall.sh
@@ -1,324 +1,464 @@
 #!/bin/sh
-source	"scripts/testheader.inc"
+alias mk="scripts/mkpkg"

-skip	mk	busybox
-bb	mk	bash
-bb	mk	bzip2
-bb	mk	coreutils
-bb	mk	diffutils
-bb	mk	findutils
-EXE	mk	flex                           OK
-bb	mk	gawk
-bb	mk	grep			
-EXE	mk	make                           OK
-comment "# Other development stuff"
-EXE	mk	autoconf                       OK	
-EXE	mk	automake                       OK	
-EXE	mk	bison                          OK	
-EXE	mk	cvs                            OK	
-EXE	mk	distcc                         OK	
-EXE	mk	dmalloc                        OK	
-EXE	mk	fakeroot                       OK	
-EXE	mk	gettext                        OK	
-EXE	mk	libgmp                         OK	
-EXE	mk	gperf                          OK	
-EXE	mk	libmpfr                        OK	
-EXE	mk	libtool                        OK	
-EXE	mk	libiconv                       OK  
-EXE	mk	popt                           FAIL	"undefined reference to libiconv"
-EXE	mk	m4                             OK	
-skip	mk	mpatrol                        DISABLED	"Needs gdb to build, and GDB_VERSION is not defined"
-EXE	mk	oprofile                       FAIL	"popt: undefined reference to libiconv"
-EXE	mk	pkgconfig                      OK	
-EXE	mk	readline                       OK	
-skip	mk	valgrind                       DISABLED	"x86 specific" 
-EXE	mk	pcre                           OK	
-comment "Other stuff"
-EXE	mk	at                             OK	
-EXE	mk	beecrypt                       OK	
-AVR	mk	berkeleydb                     FAIL	"Machine avr32 not recognized"
-EXE	mk	bsdiff                         OK	
-bb	mk	bootutils			?
-EXE	mk	cups                           OK	
-EXE	mk	customize                      OK	
-bb	mk	dash				?
-EXE	mk	file                           OK	
-EXE	mk	gamin                          OK	
-EXE	mk	icu                            FAIL	"No rule to create out"
-AVR	mk	kexec                          FAIL	"Machine avr32 not recognized"
-bb	mk	less
-EXE	mk	libconfig                      OK	
-EXE	mk	libconfuse                     OK	
-EXE	mk	libdaemon                      OK	
-EXE	mk	libelf                         OK	
-AVR	mk	libevent                       FAIL	"Machine avr32 not recognized"
-skip	mk	libfloat                       DISABLED	  
-EXE	mk	libgcrypt                      OK	
-EXE	mk	libgpg-error                   OK	
-EXE	mk	liblockfile                    OK	
-EXE	mk	liboil                         OK	
-EXE	mk	libsysfs                       OK	
-EXE	mk	lockfile-progs                 OK	
-EXE	mk	logrotate                      FAIL	"undefined reference to libiconv"
-EXE	mk	lsof                           OK	
-skip	mk	ltp-testsuite                  DISABLED	  
-AVR	mk	ltrace                         FAIL	"Machine avr32 not recognized"
-skip	mk	ltt                            DISABLED	"Obsolete package ltt-ng"
-EXE	mk	memstat                        OK
-mk	mk	module-init-tools
-mk	mk	modutils
-EXE	mk	ng-spice-rework                FAIL	"Environment change"
-bb	mk	procps
-bb	mk	psmisc
-EXE	mk	screen                         OK	
-EXE	mk	strace                         OK	
-EXE	mk	sudo                           OK	
-bb	mk	sysklogd
-eomment "busybox has init and the runit stuff"
-bb	mk	sysvinit
-bb	mk	tinylogin
-bb	mk	util-linux
-bb	mk	which
-comment "database"
-comment "editors"
-comment "Networking applications"
-AVR	mk	argus                          FAIL	"Machine avr32 not recognized"
-EXE	mk	avahi                          OK	
-EXE	mk	axel                           OK	
-bb	mk	boa
-AVR	mk	bind                           FAIL	"Machine avr32 not recognized"
-EXE	mk	bridge                         OK	
-bb	mk	dhcp
-EXE	mk	dnsmasq                        OK	
-EXE	mk	dropbear                       OK	
-EXE	mk	ethtool                        OK	
-EXE	mk	haserl                         OK	
-skip	mk	hostap                         FAIL	"Needs PCMCIA in kernel"
-EXE	mk	ifplugd                        OK	
-skip	mk	irda-utils                     FAIL	"Makefile is invalid"
-EXE	mk	iperf                          OK	
-EXE	mk	iproute2                       OK	
-EXE	mk	ipsec-tools                    FAIL	"Compile Error"
-EXE	mk	iptables                       OK	
-AVR	mk	kismet                         FAIL	"Machine avr32 not recognized"
-EXE	mk	l2tp                           OK	
-EXE	mk	libcgi                         OK	
-EXE	mk	libcgicc                       OK	
-EXE	mk	libosip2		       FAIL
-AVR	mk	libeXosip2                     FAIL	"Machine avr32 not recognized"
-EXE	mk	libpcap                        OK	
-EXE	mk	libupnp                        OK	
-bb	mk	lighttpd
-EXE	mk	links                          OK	
-EXE	mk	lrzsz                          OK	
-EXE	mk	mdnsresponder                  FAIL	"Unable to recognise the format of the input file build/prod/mdnsd"
-bb	mk	microcom
-EXE	mk	mii-diag                       OK	
-EXE	mk	mrouted                        OK	
-EXE	mk	mutt                           FAIL	"Compile Error"
-EXE	mk	nbd                            OK	
-EXE	mk	ncftp                          OK	
-EXE	mk	neon                           OK	
-bb	mk	netcat
-EXE	mk	netkitbase                     OK	
-EXE	mk	netkittelnet                   OK	
-EXE	mk	netplug                        OK	
-EXE	mk	netsnmp                        OK	
-EXE	mk	nfs-utils                      OK	
-EXE	mk	ntp                            OK	
-EXE	mk	olsr                           OK	
-AVR	mk	ntpd                           FAIL	"Machine avr32 not recognized"
-EXE	mk	openssh                        OK	
-EXE	mk	openssl                        OK	
-EXE	mk	libcurl                        FAIL	"ELF file data encoding not little-endian"
-AVR	mk	openvpn                        FAIL	"Machine avr32 not recognized"
-EXE	mk	openswan                       FAIL	"Compile Error"
-EXE	mk	portmap                        OK	
-EXE	mk	pppd                           OK	
-EXE	mk	rp-pppoe                       OK	
-EXE	mk	pptp-linux                     OK	
-EXE	mk	proftpd                        OK	
-skip	mk	quagga                         DISABLED	  
-EXE	mk	rsync                          FAIL	"error: conflicting types"
-EXE	mk	samba                          OK	
-EXE	mk	socat                          OK	
-AVR	mk	stunnel                        FAIL	"Machine avr32 not recognized"
-EXE	mk	tcpdump                        OK	
-EXE	mk	tftpd                          OK	
-bb	mk	thttpd
-bb	mk	tinyhttpd
-skip	mk	tn5250                         FAIL	""
-EXE	mk	ttcp                           OK	
-bb	mk	udhcp
-EXE	mk	udpcast                        OK	
-EXE	mk	vpnc                           OK	
-EXE	mk	vsftpd                         OK	
-AVR	mk	vtun                           FAIL	"Machine avr32 not recognized"
-EXE	mk	webif                          OK	
-bb	mk	wget
-EXE	mk	wireless-tools                 OK	
-comment "Hardware handling / blockdevices and filesystem maintenance"
-EXE	mk	acpid                          OK	
-EXE	mk	dbus                           OK	
-AVR	mk	dbus-glib                      FAIL	"Machine avr32 not recognized"
-EXE	mk	devmem2                        OK	
-EXE	mk	dm                             OK	
-AVR	mk	dmraid                         FAIL	"Machine avr32 not recognized"
-EXE	mk	e2fsprogs                      OK	
-EXE	mk	eeprog                         OK	
-EXE	mk	fconfig                        OK	
-EXE	mk	fis                            OK	
-EXE	mk	libfuse                        OK	
-EXE	mk	gadgetfs-test                  OK	
-AVR	mk	hal                            FAIL	"Machine avr32 not recognized"
-bb	mk	hdparm
-bb	mk	hotplug
-EXE	mk	hwdata                         OK	
-EXE	mk	i2c-tools                      OK	
-EXE	mk	input-tools                    OK	
-EXE	mk	iostat                         OK	
-EXE	mk	libaio                         OK	
-skip	mk	libraw1394                     
-EXE	mk	libusb                         OK	
-EXE	mk	lm-sensors                     OK	
-EXE	mk	lvm2                           OK	
-EXE	mk	mdadm                          OK	
-EXE	mk	memtester                      OK	
-EXE	mk	mkdosfs                        OK	
-EXE	mk	mtd                            OK	
-AVR	mk	ntfs-3g                        FAIL	"Machine avr32 not recognized"
-EXE	mk	pciutils                       FAIL	"Compile Error"
-skip	mk	pcmcia                         DISABLED	""
-EXE	mk	setserial                      OK	
-bb	mk	sfdisk
-AVR	mk	smartmontools                  FAIL	"Machine avr32 not recognized"
-EXE	mk	usbmount                       OK	
-EXE	mk	usbutils                       OK	
-EXE	mk	wipe                           OK	
-skip	mk	xfsprogs                       DISABLED	  
-comment "Interpreter languages / Scripting"
-EXE	mk	lua                            OK	
-EXE	mk	microperl                      FAIL	"No rule to create target"
-EXE	mk	python                         OK	
-AVR	mk	ruby                           FAIL	"Machine avr32 not recognized"
-EXE	mk	tcl                            FAIL	"Compile Error"
-EXE	mk	php                            FAIL	"undefined references to acs_map"
-comment "text rendering applications"
-EXE	mk	dialog                         OK	
-comment "Audio and video libraries and applications"
-EXE	mk	alsa-lib                       OK	
-EXE	mk	alsa-utils                     FAIL	"undefined references to acs_map"
-EXE	mk	asterisk                       FAIL	"Patch fails"
-EXE	mk	aumix                          OK	
-EXE	mk	gstreamer                      OK	
-EXE	mk	gst-plugins-base               OK	
-EXE	mk	gst-plugins-good               FAIL	"/usr/lib/libaa.so: could not read symbols: File in wrong format"
-EXE	mk	gst-plugins-ugly               OK	
-EXE	mk	libid3tag                      OK	
-EXE	mk	libmad                         OK	
-EXE	mk	libmpd                         OK	
-EXE	mk	libogg                         OK	
-EXE	mk	libsndfile                     FAIL	"Error: operand out of range (AVR32 specific compile error)"
-EXE	mk	libtheora                      FAIL	"./vp3huff: cannot execute binary file"
-EXE	mk	libvorbis                      OK	
-EXE	mk	madplay                        OK	
-EXE	mk	mpg123                         OK	
-EXE	mk	mplayer                        OK	
-EXE	mk	speex                          OK	
-EXE	mk	festival                       FAIL	"undefined reference to EST_TokenStream"
-EXE	mk	vlc                            FAIL	"configure:Cannot find libmad library."
-comment "Graphic libraries and applications (graphic/text)"
-comment "text rendering libraries"
-EXE	mk	ncurses                        OK	
-EXE	mk	newt                           OK	
-EXE	mk	slang                          OK	
-comment "graphic libraries"
-EXE	mk	directfb                       OK	
-EXE	mk	directfb-examples              OK	
-EXE	mk	fbdump                         OK	
-EXE	mk	linux-fusion                   OK	
-EXE	mk	imagemagick                    FAIL	"cannot run test program while cross compiling"
-EXE	mk	jpeg                           OK	
-EXE	mk	libart                         OK	
-EXE	mk	libpng                         OK	
-EXE	mk	libungif                       OK	
-EXE	mk	lite                           OK	
-EXE	mk	pixman                         OK	
-EXE	mk	sawman                         FAIL	"LDFLAGS has changed since the previous run"
-EXE	mk	sdl                            OK	
-EXE	mk	sdl_image                      OK	
-EXE	mk	sdl_mixer                      OK	
-EXE	mk	SDL_net                        OK	
-EXE	mk	sdl_ttf                        OK	
-EXE	mk	tiff                           OK	
-comment	"busybox graphic applications"
-comment " --> May be broken in busybox"
-EXE	mk	fbv                            OK	
-EXE	mk	fbset                          OK	
-comment "other GUIs"
-SKIP
-EXE	mk	qte                            DISABLED	  
-EXE	mk	qtopia4                        DISABLED	 
-EXE	mk	x11r7 			       DISABLED
-EXE	mk	atk
-EXE	mk	cairo
-EXE	mk	pango
-EXE	mk	libdrm
-EXE	mk	liberation
-EXE	mk	libglade
-EXE	mk	libglib12
-EXE	mk	libglib2
-EXE	mk	libgtk12
-EXE	mk	libgtk2
-EXE	mk	gtk2-engines
-EXE	mk	gtk2-themes
-EXE	mk	libsexy
-EXE	mk	fltk
-EXE	mk	openmotif
-EXE	mk	fontconfig
-EXE	mk	freetype
-EXE	mk	tslib
-EXE	mk	webkit
-skip	startup-notification		"Depends on X11"
-comment	"X Window managers"
-EXE	mk	matchbox
-EXE	mk	metacity
-EXE	mk	blackbox
-comment	"X applications"
-EXE	mk	alsamixergui
-EXE	mk	dillo
-EXE	mk	docker
-EXE	mk	gqview
-EXE	mk	gmpc
-EXE	mk	gtkperf
-EXE	mk	leafpad
-EXE	mk	midori
-EXE	mk	pcmanfm
-EXE	mk	rdesktop
-EXE	mk	rxvt
-EXE	mk	sylpheed
-EXE	mk	synergy
-EXE	mk	torsmo
-EXE	mk	x11vnc
-EXE	mk	xpdf
-EXE	mk	xstroke
-EXE	mk	xvkbd
-RESTART
+function nmk()
+{
+	echo Not building $1
+}

-comment "Compressors / decompressors"
-EXE	mk	lzo                            OK	
-EXE	mk	lzma-host                      OK	
-EXE	mk	lzma-target                    OK	
-EXE	mk	zlib                           OK	
-comment "Package managers"
-EXE	mk	ipkg                           OK	
-EXE	mk	portage                        DISABLED	  
-comment "XML handling"
-EXE	mk	expat                          OK	
-EXE	mk	ezxml                          OK	
-EXE	mk	libxml2                        OK	
-EXE	mk	libxslt                        OK	
-AVR	mk	xerces                         FAIL	"Machine avr32 not recognized"
-skip	mk	java                           DISABLED	  
-skip	mk	games                          DISABLED	  
+if	[ ${already-done} == 1 ] ; then
+nmk	busybox
+fi	# ********* already-done
+#**********************************************************************************

+if	[ ${busybox-tools} == 1 ] ; then
+	mk	bash
+	mk	bzip2
+	mk	coreutils
+	mk	diffutils
+	mk	findutils
+fi
+
+mk	flex
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	gawk
+fi
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	grep
+fi
+
+mk	make
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	patch
+	mk	sed
+	mk	tar
+fi
+
+echo "Other development stuff"
+mk	autoconf
+mk	automake
+mk	bison
+
+mk	cvs
+mk	distcc
+mk	dmalloc
+mk	fakeroot
+mk	gettext
+mk	libgmp
+mk	gperf
+mk	libmpfr
+mk	libtool
+mk	m4
+mk	mpatrol
+mk	oprofile
+mk	pkgconfig
+mk	readline
+mk	valgrind
+mk	pcre
+
+echo "Other stuff"
+mk	at
+mk	beecrypt
+mk	berkeleydb
+mk	bsdiff
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	bootutils
+fi
+
+mk	cups
+mk	customize
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	dash
+fi
+
+mk	file
+mk	gamin
+mk	icu
+mk	kexec
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	less
+fi
+
+mk	libconfig
+mk	libconfuse
+mk	libdaemon
+mk	libelf
+mk	libevent
+nmk	libfloat	# obsolete
+mk	libgcrypt
+mk	libgpg-error
+mk	libiconv
+mk	liblockfile
+mk	liboil
+mk	libsysfs
+mk	lockfile-progs
+mk	logrotate
+mk	lsof
+nmk	ltp-testsuite
+mk	ltrace
+mk	ltt
+mk	memstat
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	module-init-tools
+	mk	modutils
+fi
+
+mk	ng-spice-rework
+mk	popt
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	procps
+fi
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	psmisc
+fi
+
+mk	screen
+mk	strace
+mk	sudo
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	sysklogd
+# busybox has init and the runit stuff
+	mk	sysvinit
+	mk	tinylogin
+	mk	util-linux
+	mk	which
+fi
+
+mk	database
+
+if	[ ${busybox-tools} == 1 ] ; then
+	# busybox has an editor
+
+	# text editors
+	mk	editors
+
+fi
+
+
+echo "Networking applications"
+mk	argus
+mk	avahi
+mk	axel
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	boa
+fi
+
+mk	bind
+mk	bridge
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	dhcp
+fi
+
+mk	dnsmasq
+mk	dropbear
+mk	ethtool
+mk	haserl
+mk	hostap
+mk	ifplugd
+nmk	irda-utils	# makefile is broken
+mk	iperf
+mk	iproute2
+mk	ipsec-tools
+mk	iptables
+mk	kismet
+mk	l2tp
+mk	libcgi
+mk	libcgicc
+mk	libcurl
+mk	libeXosip2
+mk	libosip2
+mk	libpcap
+mk	libupnp
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	lighttpd
+fi
+mk	links
+mk	lrzsz
+mk	mdnsresponder
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	microcom
+fi
+mk	mii-diag
+mk	mrouted
+mk	mutt
+mk	nbd
+mk	ncftp
+mk	neon
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	netcat
+fi
+mk	netkitbase
+mk	netkittelnet
+mk	netplug
+mk	netsnmp
+mk	nfs-utils
+mk	ntp
+mk	olsr
+mk	ntpd
+mk	openssh
+mk	openssl
+mk	openvpn
+mk	openswan
+mk	portmap
+mk	pppd
+mk	rp-pppoe
+mk	pptp-linux
+mk	proftpd
+nmk	quagga
+mk	rsync
+mk	samba
+mk	socat
+mk	stunnel
+mk	tcpdump
+mk	tftpd
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	thttpd
+	mk	tinyhttpd
+fi
+mk	tn5250
+mk	ttcp
+if	[ ${busybox-tools} == 1 ] ; then
+	# ATTENTION! This was merged into busybox!
+	nmk	udhcp
+fi
+mk	udpcast
+mk	vpnc
+mk	vsftpd
+mk	vtun
+mk	webif
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	wget
+fi
+
+mk	wireless-tools
+
+
+echo "Hardware handling / blockdevices and filesystem maintenance"
+mk	acpid
+mk	dbus
+mk	dbus-glib
+mk	devmem2
+mk	dm
+mk	dmraid
+mk	e2fsprogs
+mk	eeprog
+mk	fconfig
+mk	fis
+mk	libfuse
+mk	gadgetfs-test
+mk	hal
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	hdparm
+	mk	hotplug
+fi
+mk	hwdata
+mk	i2c-tools
+mk	input-tools
+mk	iostat
+mk	libaio
+mk	libraw1394
+mk	libusb
+mk	lm-sensors
+mk	lvm2
+mk	mdadm
+mk	memtester
+mk	mkdosfs
+mk	mtd
+mk	ntfs-3g
+mk	pciutils
+mk	pcmcia
+mk	raidtools2
+mk	setserial
+if	[ ${busybox-tools} == 1 ] ; then
+	# busybox has fdisk
+	mk	sfdisk
+fi
+mk	smartmontools
+if	[ ${busybox-tools} == 1 ] ; then
+	# mdev
+	mk	udev
+fi
+mk	usbmount
+mk	usbutils
+mk	wipe
+nmk	xfsprogs
+echo "	text rendering applications"
+mk	dialog
+
+# Audio/Video support
+echo "Audio and video libraries and applications"
+mk	alsa-lib
+mk	alsa-utils
+mk	asterisk
+
+
+if	[ ${already-done} == 1 ] ; then
+
+mk	aumix
+mk	gstreamer
+mk	gst-plugins-base
+mk	gst-plugins-good
+mk	gst-plugins-ugly
+mk	libid3tag
+mk	libmad
+mk	libmpd
+mk	libogg
+mk	libsndfile
+mk	libtheora
+mk	libvorbis
+mk	madplay
+mk	mpg123
+mk	mplayer
+mk	speex
+mk	festival
+mk	vlc
+
+
+echo "Graphic libraries and applications (graphic/text)"
+echo "	text rendering libraries"
+mk	ncurses
+mk	newt
+mk	slang
+
+
+echo "	graphic libraries"
+mk	directfb
+mk	directfb-examples
+mk	fbdump
+mk	linux-fusion
+mk	imagemagick
+mk	jpeg
+mk	libart
+mk	libpng
+mk	libungif
+mk	lite
+mk	pixman
+mk	sawman
+mk	sdl
+mk	sdl_image
+mk	sdl_mixer
+mk	SDL_net
+mk	sdl_ttf
+mk	tiff
+
+echo "busybox graphic applications"
+echo "--> May be broken in busybox"
+mk	fbv
+mk	fbset
+
+echo "other GUIs"
+mk	qte
+mk	qtopia4
+
+
+if	[ ${X-WIN} == 1 ] ; then
+
+
+	mk	x11r7
+
+echo "X libraries and helper libraries"
+echo "maybe some of these should depend on !BR2_PACKAGE_XSERVER_none"
+mk	atk
+mk	cairo
+mk	pango
+mk	libdrm
+mk	liberation
+mk	libglade
+mk	libglib12
+mk	libglib2
+mk	libgtk12
+mk	libgtk2
+mk	gtk2-engines
+mk	gtk2-themes
+mk	libsexy
+mk	fltk
+mk	openmotif
+mk	fontconfig
+mk	freetype
+mk	tslib
+mk	webkit
+
+nmk	startup-notification		# Depends on X11
+
+echo "X Window managers"
+mk	matchbox
+mk	metacity
+mk	blackbox
+
+echo "X applications"
+mk	alsamixergui
+mk	dillo
+mk	docker
+mk	gqview
+mk	gmpc
+mk	gtkperf
+mk	leafpad
+mk	midori
+mk	pcmanfm
+mk	rdesktop
+mk	rxvt
+mk	sylpheed
+mk	synergy
+mk	torsmo
+mk	x11vnc
+mk	xpdf
+mk	xstroke
+mk	xvkbd
+fi
+
+echo "Compressors / decompressors"
+
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	gzip
+fi
+mk	lzo
+mk	lzma-host
+mk	lzma-target
+mk	zlib
+
+echo "Package managers"
+
+mk	ipkg
+nmk	portage
+if	[ ${busybox-tools} == 1 ] ; then
+	mk	rpm
+fi
+
+echo "Interpreter languages / Scripting"
+
+mk	lua
+mk	microperl
+mk	python
+mk	ruby
+mk	tcl
+mk	php
+
+echo "XML handling"
+
+mk	expat
+mk	ezxml
+mk	libxml2
+mk	libxslt
+mk	xerces
+
+
+# java support
+nmk	java
+
+# various games packages
+nmk	games
+
+fi	# ********* already-done
+#**********************************************************************************
--- a/scripts/testheader.inc
+++ b/scripts/testheader.inc
@@ -1,111 +0,0 @@
-alias mk="scripts/mkpkg"
-
-function	header()
-{
-	echo "#!/bin/sh"
-	echo "source \"scripts/testheader.inc\""
-	
-}
-
-active=1
-busybox=0
-
-function	SKIP()
-{
-	echo SKIP
-	active=0
-}
-
-function	RESTART()
-{
-	echo RESTART
-	active=1
-}
-
-function	EXE()
-{
-	printf 	"EXE	"
-	if [ ${active} == 1 ] ; then
-		printf "$1	"
-		$1 $2 $3 $4 $5 $6
-		return 0;
-	else
-		echo "$1 $2 $3 $4 $5 $6"
-		return 1;
-	fi
-}
-
-function	AVR()
-{
-	printf 	"AVR	"
-	if [ "${ARCH}X" == "avr32X" ] ; then
-		echo "mk $2 UNSUPPORTED \"$4\" $5 $6"
-		return 1;
-	elif [ ${active} == 1 ] ; then
-		printf "$1	"
-		$1 $2 $3 $4 $5 $6
-		return 0;
-	else
-		echo "$1 $2 $3 $4 $5 $6"
-		return 1;
-	fi
-}
-
-
-function skip()
-{
-	printf "skip	%-31s" "$1"
-	if [ "$2X" == "OKX" ] ; then
-		echo "DISABLED	$3 $4"
-	elif [ "$2X" == "FAILX" ] ; then
-		echo "DISABLED	$3 $4"
-	elif [ "$2X" == "BROKENX" ] ; then
-		echo "DISABLED	$3 $4"
-	elif [ "$2X" == "DISABLEDX" ] ; then
-		echo "DISABLED	\"$3 $4\""
-	else
-		echo "DISABLED	\"$2 $3 $4\""
-	fi
-}
-
-function bb()
-{
-	printf 	"bb	"
-	if [ ${busybox} == 1 ] ; then
-		printf "$1	"
-		$1 $2 $3 $4 $5 $6
-		return 0;
-	else
-		echo "$1 $2 $3 $4 $5 $6"
-		return 1;
-	fi
-}
-
-function	comment()
-{
-	echo	"comment	$1"
-}
-
-# Enable HASERL
-sed -i s/.*BR2_PACKAGE_HASERL.*// .config
-echo "# BR2_PACKAGE_HASERL_VERSION_0_8_X is not set" >> .config
-echo "BR2_PACKAGE_HASERL_VERSION_0_9_X=y" >> .config
-echo "BR2_PACKAGE_HASERL_VERSION=\"0.9.25\"" >> .config
-echo "BR2_PACKAGE_HASERL=y" >> .config
-# Enable SSL
-sed -i s/.*BR2_PACKAGE_OPENSSL.*// .config
-echo "BR2_PACKAGE_OPENSSL=y" >> .config
-# Enable socat
-sed -i s/.*BR2_PACKAGE_SOCAT.*// .config
-echo "BR2_PACKAGE_SOCAT=y" >> .config
-echo "BR2_PACKAGE_SOCAT_PREDEF_CRDLY_SHIFT=\"9\"" >> .config
-echo "BR2_PACKAGE_SOCAT_PREDEF_TABDLY_SHIFT=\"11\"" >> .config
-echo "BR2_PACKAGE_SOCAT_PREDEF_CSIZE_SHIFT=\"4\"" >> .config
-# Enable Freetype
-sed -i s/.*BR2_PACKAGE_FREETYPE.*// .config
-echo "BR2_PACKAGE_FREETYPE=y" >> .config
-sed -i s/.*BR2_FREETYPE_VERSION.*// .config
-echo "# BR2_FREETYPE_VERSION_2_2_1 is not set" >> .config
-echo "BR2_FREETYPE_VERSION_2_3_7=y" >> .config
-echo "BR2_FREETYPE_VERSION=\"2.3.7\"" >> .config
-
--- a/target/device/Atmel/arch-arm/Makefile.in
+++ b/target/device/Atmel/arch-arm/Makefile.in
@@ -1,2 +0,0 @@
-include target/device/Atmel/arch-arm/u-boot/Makefile.in
-
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-001-at91rm9200.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-001-at91rm9200.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-002-at91rm9200dk.h.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-002-at91rm9200dk.h.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-003-at91rm9200dk.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-003-at91rm9200dk.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-004-at91rm9200ek.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-004-at91rm9200ek.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-005-at91sam9g20ek.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-005-at91sam9g20ek.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-006-drivers-net-macb.c.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-006-drivers-net-macb.c.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-007-tools.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-007-tools.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-008-Makefile.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-008-Makefile.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-009-factory.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-009-factory.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-010-coloured_led.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-010-coloured_led.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-011-spimux.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-011-spimux.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-012-ethinit.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-012-ethinit.patch
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-013-configs.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-013-configs.patch
--- a/target/device/Atmel/arch-arm/u-boot/Config.in
+++ b/target/device/Atmel/arch-arm/u-boot/Config.in
@@ -1,20 +0,0 @@
-choice
-	prompt "Add AT91 specific patches to u-Boot"
-	default BR2_TARGET_U_BOOT_2009_01_ARCH_AT91
-	help
-	  Select a patch to add to U-Boot
-
-config	BR2_TARGET_U_BOOT_2009_01_ARCH_AT91
-	bool "AT91 patches for u-boot-2009.01"
-	depends on BR2_TARGET_ATMEL && BR2_arm
-	help
-	  Apply the at91 u-boot-2009.01 patches
-
-endchoice
-
-config	BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR
-	string
-	depends on BR2_TARGET_U_BOOT_ARCH_PATCH
-	default "target/device/Atmel/arch-arm/u-boot/2009.01" if BR2_TARGET_U_BOOT_2009_01_ARCH_AT91
-	default ""
-
--- a/target/device/Atmel/arch-arm/u-boot/Makefile.in
+++ b/target/device/Atmel/arch-arm/u-boot/Makefile.in
@@ -1,5 +0,0 @@
-ifneq ($(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR),)
-U_BOOT_ARCH_PATCH_DIR:=$(strip $(subst ",, $(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR)))
-#"))
-endif
-
--- a/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig
+++ b/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig
@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# Fri Jan 23 18:35:10 2009
+# Tue Jan 13 19:37:43 2009
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2009.02-svn"
+BR2_VERSION="0.10.0-svn"
 # BR2_alpha is not set
 BR2_arm=y
 # BR2_armeb is not set
@@ -151,11 +151,11 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER
 # BR2_TARGET_GENERIC_ACCESS_POINT is not set
 # BR2_TARGET_GENERIC_FIREWALL is not set
 # BR2_TARGET_GENERIC_DEV_SYSTEM is not set
-# BR2_TARGET_TEST_PACKAGES is not set

 #
 # Build options
 #
+BR2_PRIMARY_SITE=""
 BR2_WGET="wget --passive-ftp"
 BR2_SVN_CO="svn co"
 BR2_SVN_UP="svn up"
@@ -168,8 +168,6 @@ BR2_DL_DIR="$(BASE_DIR)/dl"
 #
 # Mirrors and Download locations
 #
-BR2_PRIMARY_SITE=""
-BR2_BACKUP_SITE="http://buildroot.uclibc.org/downloads/sources/"
 BR2_SOURCEFORGE_MIRROR="easynews"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
@@ -244,7 +242,7 @@ BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_KERNEL_HEADERS_2_6_27=y
 # BR2_KERNEL_HEADERS_2_6_28 is not set
 # BR2_KERNEL_HEADERS_SNAP is not set
-BR2_DEFAULT_KERNEL_HEADERS="2.6.27.12"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.27.10"

 #
 # uClibc Options
@@ -269,14 +267,14 @@ BR2_UCLIBC_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 is not set
+BR2_BINUTILS_VERSION_2_18=y
 # 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_19=y
-BR2_BINUTILS_VERSION="2.19"
+# BR2_BINUTILS_VERSION_2_19 is not set
+BR2_BINUTILS_VERSION="2.18"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""

 #
@@ -288,12 +286,12 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 # BR2_GCC_VERSION_4_2_1 is not set
 # BR2_GCC_VERSION_4_2_2 is not set
 # BR2_GCC_VERSION_4_2_3 is not set
-# BR2_GCC_VERSION_4_2_4 is not set
+BR2_GCC_VERSION_4_2_4=y
 # BR2_GCC_VERSION_4_3_1 is not set
-BR2_GCC_VERSION_4_3_2=y
+# BR2_GCC_VERSION_4_3_2 is not set
 BR2_GCC_SUPPORTS_SYSROOT=y
-BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
-BR2_GCC_VERSION="4.3.2"
+# BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
+BR2_GCC_VERSION="4.2.4"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -331,7 +329,6 @@ BR2_INET_IPV6=y
 BR2_INET_RPC=y
 BR2_USE_WCHAR=y
 # BR2_SOFT_FLOAT is not set
-# BR2_VFP_FLOAT is not set
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y

@@ -400,22 +397,21 @@ BR2_PACKAGE_READLINE_TARGET=y
 # BR2_PACKAGE_CUSTOMIZE is not set
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_GAMIN is not set
-BR2_PACKAGE_ICU=y
+# BR2_PACKAGE_ICU is not set
 # BR2_PACKAGE_KEXEC is not set
 # BR2_PACKAGE_LIBCONFIG is not set
 # BR2_PACKAGE_LIBCONFUSE is not set
-# BR2_PACKAGE_LIBDAEMON is not set
+BR2_PACKAGE_LIBDAEMON=y
 # BR2_PACKAGE_LIBELF is not set
 # BR2_PACKAGE_LIBEVENT is not set
 # BR2_PACKAGE_LIBFLOAT is not set
 # BR2_PACKAGE_LIBGCRYPT is not set
 # BR2_PACKAGE_LIBGPG_ERROR is not set
 # BR2_PACKAGE_LIBICONV is not set
-# BR2_PACKAGE_LIBIDN is not set
-BR2_PACKAGE_LIBLOCKFILE=y
+# BR2_PACKAGE_LIBLOCKFILE is not set
 BR2_PACKAGE_LIBOIL=y
 # BR2_PACKAGE_LIBSYSFS is not set
-BR2_PACKAGE_LOCKFILE_PROGS=y
+# BR2_PACKAGE_LOCKFILE_PROGS is not set
 # BR2_PACKAGE_LOGROTATE is not set
 # BR2_PACKAGE_LSOF is not set
 # BR2_PACKAGE_LTP-TESTSUITE is not set
@@ -446,9 +442,10 @@ BR2_PACKAGE_SQLITE=y
 # BR2_PACKAGE_AVAHI is not set
 # BR2_PACKAGE_AXEL is not set
 # BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_DNSMASQ is not set
-# BR2_PACKAGE_DROPBEAR is not set
+BR2_PACKAGE_BRIDGE=y
+BR2_PACKAGE_DNSMASQ=y
+BR2_PACKAGE_DNSMASQ_TFTP=y
+BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_ETHTOOL is not set
 # BR2_PACKAGE_HASERL is not set
 # BR2_PACKAGE_IFPLUGD is not set
@@ -541,30 +538,12 @@ BR2_PACKAGE_TFTPD=y
 #
 # Hardware handling / blockdevices and filesystem maintenance
 #
-BR2_PACKAGE_DBUS=y
-# BR2_DBUS_EXPAT is not set
-BR2_DBUS_LIBXML2=y
-# BR2_PACKAGE_DBUS_GLIB is not set
+# BR2_PACKAGE_DBUS is not set
 # BR2_PACKAGE_DEVMEM2 is not set
 # BR2_PACKAGE_DM is not set
 # BR2_PACKAGE_DMRAID is not set
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
-BR2_PACKAGE_E2FSPROGS_BLKID=y
-BR2_PACKAGE_E2FSPROGS_CHATTR=y
-BR2_PACKAGE_E2FSPROGS_DUMPE2FS=y
-BR2_PACKAGE_E2FSPROGS_E2FSCK=y
-BR2_PACKAGE_E2FSPROGS_E2LABEL=y
-BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-BR2_PACKAGE_E2FSPROGS_FINDFS=y
-BR2_PACKAGE_E2FSPROGS_FSCK=y
-BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
-BR2_PACKAGE_E2FSPROGS_LSATTR=y
-BR2_PACKAGE_E2FSPROGS_MKE2FS=y
-BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
-BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
-BR2_PACKAGE_E2FSPROGS_UUIDGEN=y
-BR2_PACKAGE_EEPROG=y
+# BR2_PACKAGE_E2FSPROGS is not set
+# BR2_PACKAGE_EEPROG is not set
 # BR2_PACKAGE_FCONFIG is not set
 # BR2_PACKAGE_FIS is not set
 # BR2_PACKAGE_LIBFUSE is not set
@@ -616,10 +595,8 @@ BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_RAIDTOOLS is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
-BR2_PACKAGE_UDEV_VOLUME_ID=y
-BR2_PACKAGE_UDEV_SCSI_ID=y
-BR2_PACKAGE_USBMOUNT=y
-BR2_PACKAGE_USBUTILS=y
+# BR2_PACKAGE_USBMOUNT is not set
+# BR2_PACKAGE_USBUTILS is not set
 # BR2_PACKAGE_WIPE is not set
 # BR2_PACKAGE_XFSPROGS is not set

@@ -627,7 +604,6 @@ BR2_PACKAGE_USBUTILS=y
 # Audio and video libraries and applications
 #
 BR2_PACKAGE_ALSA_LIB=y
-BR2_PACKAGE_ALSA_LIB_PYTHON=y
 BR2_PACKAGE_ALSA_UTILS=y

 #
@@ -652,7 +628,75 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 # asterisk	- disabled (required openssl and mpg123)
 #
 BR2_PACKAGE_AUMIX=y
-# BR2_PACKAGE_GSTREAMER is not set
+BR2_PACKAGE_GSTREAMER=y
+BR2_PACKAGE_GST_PLUGINS_BASE=y
+
+#
+# dependency-less plugins
+#
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER is not set
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOCONVERT=y
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORATE is not set
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE=y
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC is not set
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE=y
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP is not set
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK=y
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_SUBPARSE is not set
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TCP is not set
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND=y
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC is not set
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEORATE is not set
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOSCALE=y
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME=y
+
+#
+# plugins with external dependencies (there may be more available)
+#
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG is not set
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA is not set
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS is not set
+BR2_PACKAGE_GST_PLUGINS_GOOD=y
+
+#
+# dependency-less plugins
+#
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_APETAG is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOFX is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUTODETECT is not set
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AVI=y
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CUTTER is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEBUG is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EFFECTV is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EQUALIZER is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1 is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LEVEL is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MONOSCOPE is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_QTDEMUX is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER is not set
+# BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVENC is not set
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE=y
+# BR2_PACKAGE_GST_PLUGINS_UGLY is not set
 BR2_PACKAGE_LIBID3TAG=y
 BR2_PACKAGE_LIBMAD=y
 # BR2_PACKAGE_LIBMAD_TARGET_HEADERS is not set
@@ -664,7 +708,7 @@ BR2_PACKAGE_LIBVORBIS=y
 BR2_PACKAGE_LIBVORBIS_TREMOR=y
 BR2_PACKAGE_MADPLAY=y
 BR2_PACKAGE_MADPLAY_ALSA=y
-# BR2_PACKAGE_MPG123 is not set
+BR2_PACKAGE_MPG123=y
 BR2_PACKAGE_MPG123_ALSA=y
 BR2_PACKAGE_MPLAYER=y
 # BR2_PACKAGE_SPEEX is not set
@@ -679,10 +723,10 @@ BR2_PACKAGE_MPLAYER=y
 # text rendering libraries
 #
 BR2_PACKAGE_NCURSES=y
-BR2_PACKAGE_NCURSES_TARGET_PANEL=y
-BR2_PACKAGE_NCURSES_TARGET_FORM=y
-BR2_PACKAGE_NCURSES_TARGET_MENU=y
-BR2_PACKAGE_NCURSES_TARGET_HEADERS=y
+# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
+# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
+# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
+# BR2_PACKAGE_NCURSES_TARGET_HEADERS is not set
 # BR2_PACKAGE_NEWT is not set
 # BR2_PACKAGE_SLANG is not set

@@ -712,7 +756,7 @@ BR2_PACKAGE_LIBUNGIF=y
 BR2_PACKAGE_LINUX_FUSION=y
 BR2_PACKAGE_LITE=y
 BR2_PACKAGE_PIXMAN=y
-BR2_PACKAGE_SAWMAN=y
+# BR2_PACKAGE_SAWMAN is not set
 BR2_PACKAGE_SDL=y

 #
@@ -740,7 +784,7 @@ BR2_PACKAGE_SDL_IMAGE_JPEG=y
 # BR2_PACKAGE_SDL_IMAGE_XPM is not set
 # BR2_PACKAGE_SDL_IMAGE_XV is not set
 BR2_PACKAGE_SDL_MIXER=y
-BR2_PACKAGE_SDL_NET=y
+# BR2_PACKAGE_SDL_NET is not set
 BR2_PACKAGE_SDL_TTF=y
 # BR2_PACKAGE_TIFF is not set

@@ -780,10 +824,7 @@ BR2_PACKAGE_LIBGTK2_ENGINES=y
 # GTK Themes
 #
 BR2_PACKAGE_GTK2_THEME_HICOLOR=y
-
-#
-# libsexy       - disabled (requires X-Windows)
-#
+BR2_PACKAGE_LIBSEXY=y
 # BR2_PACKAGE_OPENMOTIF is not set
 BR2_PACKAGE_FONTCONFIG=y
 BR2_PACKAGE_FREETYPE=y
@@ -791,10 +832,7 @@ BR2_PACKAGE_FREETYPE=y
 BR2_FREETYPE_VERSION_2_3_7=y
 BR2_FREETYPE_VERSION="2.3.7"
 BR2_PACKAGE_TSLIB=y
-
-#
-# webkit       - disabled (requires X-Windows)
-#
+# BR2_PACKAGE_WEBKIT is not set

 #
 # X Window managers
@@ -839,14 +877,13 @@ BR2_PACKAGE_ZLIB=y
 # Package managers
 #
 # BR2_PACKAGE_IPKG is not set
-# BR2_PACKAGE_PORTAGE is not set
+BR2_PACKAGE_PORTAGE=y

 #
 # Interpreter languages / Scripting
 #
 # BR2_PACKAGE_LUA is not set
-BR2_PACKAGE_MICROPERL=y
-BR2_PACKAGE_MICROPERL_MODULES=""
+# BR2_PACKAGE_MICROPERL is not set
 BR2_PACKAGE_PYTHON=y
 # BR2_PACKAGE_PYTHON_DEV is not set
 BR2_PACKAGE_PYTHON_PY_ONLY=y
@@ -910,7 +947,7 @@ BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
 BR2_PACKAGE_EXPAT=y
 # BR2_PACKAGE_EZXML is not set
 BR2_PACKAGE_LIBXML2=y
-BR2_PACKAGE_LIBXSLT=y
+# BR2_PACKAGE_LIBXSLT is not set
 # BR2_PACKAGE_XERCES is not set

 #
@@ -979,15 +1016,12 @@ BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
 #
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
-BR2_TARGET_UBOOT_2009_01=y
+BR2_TARGET_UBOOT_2009_01_RC1=y
 # BR2_TARGET_UBOOT_2008_10 is not set
 # BR2_TARGET_UBOOT_1_3_4 is not set
 # BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
-BR2_UBOOT_VERSION="2009.01"
+BR2_UBOOT_VERSION="2009.01-rc1"
 BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
-BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
-BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
 BR2_TARGET_UBOOT_CUSTOM_PATCH=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
@@ -1044,9 +1078,9 @@ BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_FORMAT="uImage"
-BR2_KERNEL_CURRENT_VERSION="2.6.28.1"
+BR2_KERNEL_CURRENT_VERSION="2.6.28"
 BR2_KERNEL_LATEST_2_6_28="1"
-BR2_KERNEL_LATEST_2_6_27="12"
+BR2_KERNEL_LATEST_2_6_27="10"
 BR2_KERNEL_LATEST_2_6_26="8"
 BR2_KERNEL_LATEST_2_6_25="9"
 BR2_KERNEL_LATEST_2_6_24="7"
@@ -1056,7 +1090,7 @@ BR2_KERNEL_LATEST_2_6_21="7"
 BR2_KERNEL_LATEST_2_6_20="21"
 BR2_KERNEL_NEXT_VERSION="2.6.29"
 BR2_KERNEL_THIS_VERSION="2.6.28"
-BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6"
+BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
 BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
 BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
 # BR2_LINUX_2_6_STABLE is not set
@@ -1066,7 +1100,11 @@ BR2_LINUX_2_6_28=y
 # BR2_LINUX_2_6_25 is not set
 # BR2_LINUX_2_6_24 is not set
 # BR2_LINUX_2_6_23 is not set
+# BR2_LINUX_2_6_22_10 is not set
+# BR2_LINUX_2_6_22_1 is not set
 # BR2_LINUX_2_6_22 is not set
+# BR2_LINUX_2_6_21_7 is not set
+# BR2_LINUX_2_6_21_5 is not set
 # BR2_LINUX_2_6_21 is not set
 # BR2_LINUX_2_6_20 is not set
 # BR2_LINUX_2_6_29 is not set
--- a/target/device/Atmel/atngw100/atngw100_defconfig
+++ b/target/device/Atmel/atngw100/atngw100_defconfig
@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# Fri Jan 16 23:00:00 2009
+# Sat Jan 10 02:15:06 2009
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2009.02-svn"
+BR2_VERSION="0.10.0-svn"
 # BR2_alpha is not set
 # BR2_arm is not set
 # BR2_armeb is not set
@@ -16,6 +16,7 @@ BR2_avr32=y
 # BR2_mipsel is not set
 # BR2_nios2 is not set
 # BR2_powerpc is not set
+# BR2_s390 is not set
 # BR2_sh is not set
 # BR2_sh64 is not set
 # BR2_sparc is not set
@@ -84,6 +85,7 @@ BR2_BOARD_PATH="target/device/Atmel/$(BR2_BOARD_NAME)"
 #
 # Build options
 #
+BR2_PRIMARY_SITE=""
 BR2_WGET="wget --passive-ftp --retry-connrefused --waitretry=10"
 BR2_SVN_CO="svn co"
 BR2_SVN_UP="svn up"
@@ -96,8 +98,6 @@ BR2_DL_DIR="$(BASE_DIR)/dl"
 #
 # Mirrors and Download locations
 #
-BR2_PRIMARY_SITE=""
-BR2_BACKUP_SITE="http://buildroot.uclibc.org/downloads/sources/"
 BR2_SOURCEFORGE_MIRROR="easynews"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
@@ -165,7 +165,7 @@ BR2_EXT_GCC_VERSION_4_2_2=y
 # 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_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_30=y

 #
@@ -186,7 +186,7 @@ BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_KERNEL_HEADERS_2_6_27=y
 # BR2_KERNEL_HEADERS_2_6_28 is not set
 # BR2_KERNEL_HEADERS_SNAP is not set
-BR2_DEFAULT_KERNEL_HEADERS="2.6.27.11"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.27.10"

 #
 # uClibc Options
@@ -352,7 +352,6 @@ BR2_PACKAGE_LIBDAEMON=y
 # BR2_PACKAGE_LIBGCRYPT is not set
 # BR2_PACKAGE_LIBGPG_ERROR is not set
 BR2_PACKAGE_LIBICONV=y
-# BR2_PACKAGE_LIBIDN is not set
 # BR2_PACKAGE_LIBLOCKFILE is not set
 # BR2_PACKAGE_LIBOIL is not set
 # BR2_PACKAGE_LIBSYSFS is not set
@@ -399,6 +398,7 @@ BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_HASERL_VERSION_0_9_X=y
 BR2_PACKAGE_HASERL_VERSION="0.9.25"
 # BR2_PACKAGE_IFPLUGD is not set
+# BR2_PACKAGE_IRDA_UTILS is not set
 # BR2_PACKAGE_IPERF is not set
 # BR2_PACKAGE_IPROUTE2 is not set

@@ -411,7 +411,6 @@ BR2_PACKAGE_IPTABLES=y
 # BR2_PACKAGE_LIBCGI is not set
 # BR2_PACKAGE_LIBCGICC is not set
 # BR2_PACKAGE_LIBCURL is not set
-# BR2_PACKAGE_LIBDNET is not set
 # BR2_PACKAGE_LIBEXOSIP2 is not set
 # BR2_PACKAGE_LIBOSIP2 is not set
 # BR2_PACKAGE_LIBPCAP is not set
@@ -603,7 +602,6 @@ BR2_PACKAGE_MTD_MTD_DEBUG=y
 # BR2_PACKAGE_LIBART is not set
 # BR2_PACKAGE_LIBPNG is not set
 # BR2_PACKAGE_LIBUNGIF is not set
-BR2_PACKAGE_LINUX_FUSION=y
 # BR2_PACKAGE_PIXMAN is not set
 # BR2_PACKAGE_SDL is not set
 # BR2_PACKAGE_TIFF is not set
@@ -730,7 +728,6 @@ BR2_PACKAGE_ZLIB=y
 BR2_TARGET_ROOTFS_JFFS2=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
-# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K is not set
 BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y
 # BR2_TARGET_ROOTFS_JFFS2_FLASH_64 is not set
 # BR2_TARGET_ROOTFS_JFFS2_CUSTOM is not set
--- a/target/device/Atmel/atstk100x/atstk100x_defconfig
+++ b/target/device/Atmel/atstk100x/atstk100x_defconfig
@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# Fri Jan 16 23:02:32 2009
+# Sat Jul  5 10:08:08 2008
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2009.02-svn"
+BR2_VERSION="0.10.0-svn"
 # BR2_alpha is not set
 # BR2_arm is not set
 # BR2_armeb is not set
@@ -16,11 +16,15 @@ BR2_avr32=y
 # BR2_mipsel is not set
 # BR2_nios2 is not set
 # BR2_powerpc is not set
+# BR2_s390 is not set
 # BR2_sh is not set
 # BR2_sh64 is not set
 # BR2_sparc is not set
 # BR2_sparc64 is not set
 # BR2_x86_64 is not set
+BR2_at32ap7000=y
+# BR2_at32ap7001 is not set
+# BR2_at32ap7002 is not set
 BR2_ARCH="avr32"
 BR2_ENDIAN="BIG"

@@ -40,6 +44,22 @@ BR2_BANNER="ATSTK1002 ($(DATE))"
 #
 BR2_TARGET_ATMEL=y

+#
+# Selection criteria
+#
+BR2_TARGET_ATMEL_NET=y
+BR2_TARGET_ATMEL_LCD=y
+# BR2_TARGET_ATMEL_FPDSP is not set
+# BR2_TARGET_ATMEL_MPB is not set
+
+#
+# Device Selection
+#
+
+#
+# Development Board Selection
+#
+
 #
 # Atmel AVR32 Specific Device Support
 #
@@ -47,13 +67,11 @@ BR2_TARGET_AVR32=y
 BR2_TARGET_AT32AP7000=y
 # BR2_TARGET_AT32AP7001 is not set
 # BR2_TARGET_AT32AP7002 is not set
-# BR2_TARGET_AT32AP7200 is not set

 #
 # Development board support
 #
 BR2_TARGET_AVR32_ATSTK1002=y
-# BR2_TARGET_AVR32_ATSTK1005 is not set
 # BR2_TARGET_AVR32_ATNGW100 is not set
 # BR2_TARGET_AVR32_ATNGW100_BASE is not set
 # BR2_TARGET_AVR32_ATNGW100_EXPANDED is not set
@@ -68,7 +86,7 @@ BR2_BOARD_NAME="atstk100x"
 #
 BR2_TARGET_ATMEL_COPYTO="/tftpboot"
 BR2_BOARD_PATH="target/device/Atmel/$(BR2_BOARD_NAME)"
-BR2_KERNEL_ARCH_PATCH_VERSION="2.6.27.6"
+BR2_KERNEL_ARCH_PATCH_VERSION="2.6.24"
 BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-avr32/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)"
 # BR2_TARGET_VALKA is not set

@@ -86,6 +104,7 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-avr32/kernel-patches-$(BR2_K
 #
 # Build options
 #
+BR2_PRIMARY_SITE=""
 BR2_WGET="wget --passive-ftp --retry-connrefused --waitretry=10"
 BR2_SVN_CO="svn co"
 BR2_SVN_UP="svn up"
@@ -98,8 +117,6 @@ BR2_DL_DIR="$(BASE_DIR)/dl"
 #
 # Mirrors and Download locations
 #
-BR2_PRIMARY_SITE=""
-BR2_BACKUP_SITE="http://buildroot.uclibc.org/downloads/sources/"
 BR2_SOURCEFORGE_MIRROR="easynews"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
@@ -122,7 +139,6 @@ BR2_JLEVEL=2
 # BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
 BR2_RECENT=y
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
@@ -135,7 +151,6 @@ BR2_OPTIMIZE_2=y
 # BR2_PREFER_STATIC_LIB is not set
 # BR2_HAVE_MANPAGES is not set
 # BR2_HAVE_INFOPAGES is not set
-# BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
 BR2_UPDATE_CONFIG=y

@@ -148,15 +163,15 @@ 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_2=y
 # BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3 is not set
 # BR2_TOOLCHAIN_UNKNOWNVENDOR is not set
+# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3_ENABLE 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_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"
@@ -164,16 +179,20 @@ BR2_VENDOR_PATCH_DIR="Atmel/avr32"
 # 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_BINUTILS_VERSION_2_17=y
+BR2_EXT_UCLIBC_VERSION_0_9_29=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
 #
+# BR2_KERNEL_HEADERS_2_4_25 is not set
+# BR2_KERNEL_HEADERS_2_4_27 is not set
+# BR2_KERNEL_HEADERS_2_4_29 is not set
 # BR2_KERNEL_HEADERS_2_4_31 is not set
+# BR2_KERNEL_HEADERS_2_6_9 is not set
+# BR2_KERNEL_HEADERS_2_6_11 is not set
+# BR2_KERNEL_HEADERS_2_6_12 is not set
 # BR2_KERNEL_HEADERS_2_6_20_4 is not set
 # BR2_KERNEL_HEADERS_2_6_20 is not set
 # BR2_KERNEL_HEADERS_2_6_21_5 is not set
@@ -182,45 +201,34 @@ BR2_EXT_UCLIBC_VERSION_0_9_30=y
 # BR2_KERNEL_HEADERS_2_6_22_10 is not set
 # BR2_KERNEL_HEADERS_2_6_22 is not set
 # BR2_KERNEL_HEADERS_2_6_23 is not set
-# BR2_KERNEL_HEADERS_2_6_24 is not set
+BR2_KERNEL_HEADERS_2_6_24=y
 # BR2_KERNEL_HEADERS_2_6_25 is not set
-# BR2_KERNEL_HEADERS_2_6_26 is not set
-# BR2_KERNEL_HEADERS_2_6_27 is not set
-BR2_KERNEL_HEADERS_2_6_28=y
 # BR2_KERNEL_HEADERS_SNAP is not set
-BR2_DEFAULT_KERNEL_HEADERS="2.6.28"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.24.7"

 #
 # uClibc Options
 #
 # 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_29=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
 BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
 BR2_PTHREADS_OLD=y
 # BR2_PTHREADS_NATIVE is not set
 # BR2_PTHREAD_DEBUG is not set
 BR2_UCLIBC_PROGRAM_INVOCATION=y
-# BR2_UCLIBC_INSTALL_TEST_SUITE is not set

 #
 # Binutils Options
 #
-# BR2_BINUTILS_VERSION_2_17 is not set
+BR2_BINUTILS_VERSION_2_17=y
 # 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_19 is not set
-BR2_BINUTILS_VERSION="2.18"
+BR2_BINUTILS_VERSION="2.17"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""

 #
@@ -234,7 +242,6 @@ BR2_GCC_VERSION_4_2_2=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"
@@ -291,11 +298,9 @@ BR2_PACKAGE_BUSYBOX=y
 # BR2_BUSYBOX_VERSION_1_8_X is not set
 # BR2_BUSYBOX_VERSION_1_9_X is not set
 # BR2_BUSYBOX_VERSION_1_10_X is not set
-# BR2_BUSYBOX_VERSION_1_11_X is not set
-# BR2_BUSYBOX_VERSION_1_12_X is not set
-BR2_BUSYBOX_VERSION_1_13_X=y
+BR2_BUSYBOX_VERSION_1_11_X=y
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.13.2"
+BR2_BUSYBOX_VERSION="1.11.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
@@ -333,7 +338,6 @@ BR2_HOST_FAKEROOT=y
 BR2_PACKAGE_GETTEXT=y
 BR2_PACKAGE_LIBINTL=y
 # BR2_PACKAGE_LIBGMP is not set
-# BR2_PACKAGE_GPERF is not set
 # BR2_PACKAGE_LIBMPFR is not set
 # BR2_PACKAGE_LIBTOOL is not set
 # BR2_PACKAGE_M4 is not set
@@ -356,10 +360,9 @@ BR2_PACKAGE_PKGCONFIG=y
 BR2_PACKAGE_FILE=y
 # BR2_PACKAGE_GAMIN is not set
 # BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_IPKG is not set
 # BR2_PACKAGE_KEXEC is not set
 # BR2_PACKAGE_LESS is not set
-# BR2_PACKAGE_LIBCONFIG is not set
-# BR2_PACKAGE_LIBCONFUSE is not set
 BR2_PACKAGE_LIBDAEMON=y
 # BR2_PACKAGE_LIBELF is not set
 # BR2_PACKAGE_LIBEVENT is not set
@@ -367,61 +370,59 @@ BR2_PACKAGE_LIBDAEMON=y
 # BR2_PACKAGE_LIBGCRYPT is not set
 # BR2_PACKAGE_LIBGPG_ERROR is not set
 # BR2_PACKAGE_LIBICONV is not set
-# BR2_PACKAGE_LIBIDN is not set
 # BR2_PACKAGE_LIBLOCKFILE is not set
-# BR2_PACKAGE_LIBOIL is not set
 # BR2_PACKAGE_LIBSYSFS is not set
 # BR2_PACKAGE_LOCKFILE_PROGS is not set
-# BR2_PACKAGE_LOGROTATE is not set
 # BR2_PACKAGE_LSOF is not set
 # BR2_PACKAGE_LTP-TESTSUITE is not set
 # BR2_PACKAGE_LTRACE is not set
 # BR2_PACKAGE_LTT is not set
-# BR2_PACKAGE_MEMSTAT is not set
 # BR2_PACKAGE_MODULE_INIT_TOOLS is not set
 # BR2_PACKAGE_MODUTILS is not set
 # BR2_PACKAGE_NG_SPICE_REWORK is not set
 # BR2_PACKAGE_POPT is not set
+# BR2_PACKAGE_PORTAGE is not set
 # BR2_PACKAGE_PROCPS is not set
 # BR2_PACKAGE_PSMISC is not set
+# BR2_PACKAGE_RPM is not set
 # BR2_PACKAGE_SCREEN is not set
+# BR2_PACKAGE_SQLITE is not set
 # BR2_PACKAGE_STARTUP_NOTIFICATION is not set
 BR2_PACKAGE_STRACE=y
 # BR2_PACKAGE_SUDO is not set
 # BR2_PACKAGE_SYSKLOGD is not set
 # BR2_PACKAGE_SYSVINIT is not set
+# BR2_PACKAGE_TINYLOGIN is not set
 # BR2_PACKAGE_UTIL-LINUX is not set
 # BR2_PACKAGE_WHICH is not set
-
-#
-# Database
-#
+BR2_DATABASE_SUPPORT=y
 # BR2_PACKAGE_MYSQL_CLIENT is not set
-# BR2_PACKAGE_SQLITE is not set
-
-#
-# Text editors
-#
+BR2_TEXTEDIT_SUPPORT=y
 # BR2_PACKAGE_ED is not set
 # BR2_PACKAGE_NANO is not set
 # BR2_PACKAGE_UEMACS is not set
 # BR2_PACKAGE_VIM is not set
-
-#
-# Networking
-#
+BR2_NETWORK_SUPPORT=y

 #
 # Networking applications
 #
-# BR2_PACKAGE_ARGUS is not set
+
+#
+# argus		- disabled (requires libpcap)
+#
 BR2_PACKAGE_AVAHI=y
 BR2_PACKAGE_AVAHI_AUTOIPD=y
-# BR2_PACKAGE_AVAHI_DAEMON is not set
+
+#
+# mDNS/DNS-SD daemon	- disabled (requires expat)
+#
 # BR2_PACKAGE_AXEL is not set
 # BR2_PACKAGE_BOA is not set
 # BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BRIDGE is not set
+# BR2_PACKAGE_CURL is not set
+# BR2_PACKAGE_LIBCURL is not set
 # BR2_PACKAGE_ISC_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
 BR2_PACKAGE_DROPBEAR=y
@@ -429,8 +430,9 @@ BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_HASERL=y
 # BR2_PACKAGE_HASERL_VERSION_0_8_X is not set
 BR2_PACKAGE_HASERL_VERSION_0_9_X=y
-BR2_PACKAGE_HASERL_VERSION="0.9.25"
+BR2_PACKAGE_HASERL_VERSION="0.9.23"
 # BR2_PACKAGE_IFPLUGD is not set
+# BR2_PACKAGE_IRDA_UTILS is not set
 # BR2_PACKAGE_IPERF is not set
 # BR2_PACKAGE_IPROUTE2 is not set

@@ -442,21 +444,9 @@ BR2_PACKAGE_HASERL_VERSION="0.9.25"
 # BR2_PACKAGE_L2TP is not set
 # BR2_PACKAGE_LIBCGI is not set
 # BR2_PACKAGE_LIBCGICC is not set
-# BR2_PACKAGE_LIBCURL is not set
-# BR2_PACKAGE_LIBDNET is not set
 # BR2_PACKAGE_LIBEXOSIP2 is not set
 # BR2_PACKAGE_LIBOSIP2 is not set
 # BR2_PACKAGE_LIBPCAP is not set
-# BR2_PACKAGE_LIBUPNP is not set
-BR2_PACKAGE_LIGHTTPD=y
-
-#
-# lighttpd packages
-#
-BR2_PACKAGE_LIGHTTPD_OPENSSL=y
-BR2_PACKAGE_LIGHTTPD_ZLIB=y
-BR2_PACKAGE_LIGHTTPD_BZIP2=y
-# BR2_PACKAGE_LIGHTTPD_PCRE is not set
 # BR2_PACKAGE_LINKS is not set
 BR2_PACKAGE_LRZSZ=y
 # BR2_PACKAGE_MDNSRESPONDER is not set
@@ -489,8 +479,7 @@ BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_OPENNTPD is not set
 # BR2_PACKAGE_OPENSSH is not set
 BR2_PACKAGE_OPENSSL=y
-# BR2_PACKAGE_OPENSSL_BIN is not set
-# BR2_PACKAGE_OPENSSL_ENGINES is not set
+# BR2_PACKAGE_OPENSSL_TARGET_HEADERS is not set
 # BR2_PACKAGE_OPENVPN is not set
 # BR2_PACKAGE_OPENSWAN is not set
 BR2_PACKAGE_PORTMAP=y
@@ -498,6 +487,7 @@ BR2_PACKAGE_PORTMAP=y
 # BR2_PACKAGE_RP_PPPOE is not set
 # BR2_PACKAGE_PPTP_LINUX is not set
 BR2_PACKAGE_PROFTPD=y
+# BR2_PACKAGE_QUAGGA is not set

 #
 # quagga suite
@@ -517,21 +507,29 @@ BR2_PACKAGE_RSYNC=y
 # BR2_PACKAGE_TCPDUMP is not set
 # BR2_PACKAGE_DHCPDUMP is not set
 # BR2_PACKAGE_TFTPD is not set
+BR2_PACKAGE_LIGHTTPD=y
+
+#
+# lighttpd packages
+#
+BR2_PACKAGE_LIGHTTPD_OPENSSL=y
+BR2_PACKAGE_LIGHTTPD_ZLIB=y
+BR2_PACKAGE_LIGHTTPD_BZIP2=y
+# BR2_PACKAGE_LIGHTTPD_PCRE is not set
 # BR2_PACKAGE_THTTPD is not set
 # BR2_PACKAGE_TINYHTTPD is not set
 # BR2_PACKAGE_TN5250 is not set
 # BR2_PACKAGE_TTCP is not set
 # BR2_PACKAGE_UDPCAST is not set
-# BR2_PACKAGE_VPNC is not set
-# BR2_PACKAGE_VSFTPD is not set
+
+#
+# vpnc		- disabled (requires libgcrypt and libgpg_error)
+#
 # BR2_PACKAGE_VTUN is not set
 # BR2_PACKAGE_WEBIF is not set
 # BR2_PACKAGE_WGET is not set
 BR2_PACKAGE_WIRELESS_TOOLS=y
-
-#
-# Hardware handling / blockdevices and filesystem maintenance
-#
+BR2_BLOCKDEV_SUPPORT=y

 #
 # dbus not available (need expat or libxml2)
@@ -540,7 +538,6 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
 # BR2_PACKAGE_DM is not set
 # BR2_PACKAGE_DMRAID is not set
 # BR2_PACKAGE_E2FSPROGS is not set
-# BR2_PACKAGE_EEPROG is not set
 # BR2_PACKAGE_FCONFIG is not set
 # BR2_PACKAGE_FIS is not set
 # BR2_PACKAGE_LIBFUSE is not set
@@ -600,10 +597,7 @@ BR2_PACKAGE_MTD_MTD_DEBUG=y
 # BR2_PACKAGE_USBUTILS is not set
 # BR2_PACKAGE_WIPE is not set
 # BR2_PACKAGE_XFSPROGS is not set
-
-#
-# Audio and video libraries and applications
-#
+BR2_AUDIO_SUPPORT=y
 BR2_PACKAGE_ALSA_LIB=y
 BR2_PACKAGE_ALSA_UTILS=y

@@ -629,14 +623,11 @@ BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
 # asterisk	- disabled (required openssl and mpg123)
 #
 # BR2_PACKAGE_AUMIX is not set
-# BR2_PACKAGE_GSTREAMER is not set
 # BR2_PACKAGE_LIBID3TAG is not set
 BR2_PACKAGE_LIBMAD=y
 # BR2_PACKAGE_LIBMAD_TARGET_HEADERS is not set
-# BR2_PACKAGE_LIBMPD is not set
 # BR2_PACKAGE_LIBOGG is not set
 # BR2_PACKAGE_LIBSNDFILE is not set
-# BR2_PACKAGE_LIBTHEORA is not set

 #
 # libvorbis requires the package libogg to build
@@ -644,14 +635,9 @@ BR2_PACKAGE_LIBMAD=y
 # BR2_PACKAGE_MADPLAY is not set
 # BR2_PACKAGE_MPG123 is not set
 BR2_PACKAGE_MPG123_ALSA=y
-BR2_PACKAGE_MPLAYER=y
 # BR2_PACKAGE_SPEEX is not set
 # BR2_PACKAGE_FESTIVAL is not set
-# BR2_PACKAGE_VLC is not set
-
-#
-# Graphic libraries and applications (graphic/text)
-#
+BR2_GRAPHIC_SUPPORT=y

 #
 # text rendering libraries
@@ -673,15 +659,14 @@ BR2_PACKAGE_NCURSES=y
 # graphic libraries
 #
 # BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_FBDUMP is not set
 # BR2_PACKAGE_IMAGEMAGICK is not set
 BR2_PACKAGE_JPEG=y
 # BR2_PACKAGE_LIBART is not set
 BR2_PACKAGE_LIBPNG=y
 BR2_PACKAGE_LIBUNGIF=y
-BR2_PACKAGE_LINUX_FUSION=y
-# BR2_PACKAGE_PIXMAN is not set
 # BR2_PACKAGE_SDL is not set
+# BR2_PACKAGE_SDL_MIXER is not set
+# BR2_PACKAGE_SDL_TTF is not set
 # BR2_PACKAGE_TIFF is not set

 #
@@ -724,34 +709,16 @@ BR2_PACKAGE_QTOPIA4_NOFREETYPE=y
 # BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE is not set
 BR2_PACKAGE_QTOPIA4_EMB_PLATFORM="$(ARCH)"
 # BR2_PACKAGE_QTOPIA4_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
-
-#
-# 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_XMLPATTERNS is not set
 # BR2_PACKAGE_QTOPIA4_SVG is not set
 # BR2_PACKAGE_QTOPIA4_WEBKIT is not set
 # BR2_PACKAGE_QTOPIA4_OPENSSL is not set
+
+#
+# X Window System server
+#
 BR2_PACKAGE_XSERVER_none=y
-# BR2_PACKAGE_XSERVER_xorg is not set
-# BR2_PACKAGE_XSERVER_tinyx is not set
+BR2_X11_PREFIX="/usr"

 #
 # X libraries and helper libraries
@@ -759,9 +726,13 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_ATK is not set
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
-# BR2_PACKAGE_LIBERATION is not set
 # BR2_PACKAGE_LIBGLIB12 is not set
 BR2_PACKAGE_LIBGLIB2=y
+# BR2_PACKAGE_LIBSEXY is not set
+
+#
+# fltk		- disabled (requires Xorg(7))
+#
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
 # BR2_PACKAGE_FREETYPE is not set
@@ -773,6 +744,10 @@ BR2_PACKAGE_LIBGLIB2=y
 #
 # BR2_PACKAGE_MATCHBOX is not set

+#
+# blackbox		- disabled (requires Xorg(7))
+#
+
 #
 # X applications
 #
@@ -781,6 +756,7 @@ BR2_PACKAGE_LIBGLIB2=y
 #
 # dillo		- disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))
 #
+# BR2_PACKAGE_DOCKER is not set
 # BR2_PACKAGE_GQVIEW is not set
 # BR2_PACKAGE_LEAFPAD is not set

@@ -796,55 +772,27 @@ BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_XVKBD is not set

 #
-# Compressors / decompressors
+# Video libraries/codecs and applications
 #
+BR2_PACKAGE_MPLAYER=y
+# BR2_PACKAGE_VLC is not set
+BR2_COMPRESSOR_SUPPORT=y
 # BR2_PACKAGE_GZIP is not set
 BR2_PACKAGE_LZO=y
 # BR2_PACKAGE_LZMA_TARGET is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
-
-#
-# Package managers
-#
-# BR2_PACKAGE_IPKG is not set
-# BR2_PACKAGE_PORTAGE is not set
-# BR2_PACKAGE_RPM is not set
-
-#
-# Interpreter languages / Scripting
-#
-# BR2_PACKAGE_LUA is not set
-# BR2_PACKAGE_MICROPERL is not set
-# BR2_PACKAGE_PYTHON is not set
-# BR2_PACKAGE_RUBY is not set
-# BR2_PACKAGE_TCL is not set
-# BR2_PACKAGE_PHP is not set
-
-#
-# XML handling
-#
+# BR2_SCRIPTING_SUPPORT is not set
+BR2_XML_SUPPORT=y
 # BR2_PACKAGE_EXPAT is not set
 # BR2_PACKAGE_EZXML is not set
 # BR2_PACKAGE_LIBXML2 is not set
 # BR2_PACKAGE_LIBXSLT is not set
 # BR2_PACKAGE_XERCES is not set
-
-#
-# Java
-#
+BR2_JAVA_SUPPORT=y
 # BR2_PACKAGE_CLASSPATH is not set
-
-#
-# Games
-#
-# BR2_PACKAGE_GNUCHESS is not set
-# BR2_PACKAGE_MAGICCUBE4D is not set
-# BR2_PACKAGE_PRBOOM is not set
-# BR2_PACKAGE_RUBIX is not set
-# BR2_PACKAGE_VICE is not set
-# BR2_PACKAGE_XBOARD is not set
+# BR2_GAMES is not set

 #
 # Target filesystem options
@@ -885,18 +833,16 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
 #
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="atstk1002"
-# BR2_TARGET_UBOOT_2009_01_RC1 is not set
-BR2_TARGET_UBOOT_2008_10=y
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
-BR2_UBOOT_VERSION="2008.10"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
 BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
+BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
+BR2_TARGET_UBOOT_GATEWAY="10.175.196.1"
+BR2_TARGET_UBOOT_NETMASK="255.255.255.0"
+BR2_TARGET_UBOOT_ETHADDR="04:25:fe:ed:00:18"
+BR2_TARGET_UBOOT_ETH1ADDR=""
 # BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
-# BR2_BOOTSOURCE is not set

 #
 # Kernel
@@ -908,29 +854,17 @@ BR2_KERNEL_LINUX_ADVANCED=y
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-2.6.24.config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
-BR2_KERNEL_CURRENT_VERSION="2.6.28"
-BR2_KERNEL_LATEST_2_6_28="1"
-BR2_KERNEL_LATEST_2_6_27="10"
-BR2_KERNEL_LATEST_2_6_26="8"
-BR2_KERNEL_LATEST_2_6_25="9"
-BR2_KERNEL_LATEST_2_6_24="7"
-BR2_KERNEL_LATEST_2_6_23="17"
-BR2_KERNEL_LATEST_2_6_22="19"
-BR2_KERNEL_LATEST_2_6_21="7"
-BR2_KERNEL_LATEST_2_6_20="21"
 BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
-BR2_KERNEL_NEXT_VERSION="2.6.28"
-BR2_KERNEL_THIS_VERSION="2.6.27"
+BR2_KERNEL_CURRENT_VERSION="2.6.25.9"
+BR2_KERNEL_NEXT_VERSION="2.6.25"
+BR2_KERNEL_THIS_VERSION="2.6.24"
 BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
 BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
 BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
 BR2_KERNEL_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
 # BR2_LINUX_2_6_STABLE is not set
-# BR2_LINUX_2_6_28 is not set
-BR2_LINUX_2_6_27=y
-# BR2_LINUX_2_6_26 is not set
 # BR2_LINUX_2_6_25 is not set
-# BR2_LINUX_2_6_24 is not set
+BR2_LINUX_2_6_24=y
 # BR2_LINUX_2_6_23 is not set
 # BR2_LINUX_2_6_22_10 is not set
 # BR2_LINUX_2_6_22_1 is not set
@@ -939,7 +873,8 @@ BR2_LINUX_2_6_27=y
 # BR2_LINUX_2_6_21_5 is not set
 # BR2_LINUX_2_6_21 is not set
 # BR2_LINUX_2_6_20 is not set
-# BR2_LINUX_2_6_29 is not set
+# BR2_LINUX_2_6_26 is not set
+# BR2_LINUX_2_6_27 is not set
 # BR2_LINUX26_CUSTOM is not set

 #
@@ -958,9 +893,7 @@ BR2_KERNEL_ADD_MINORPATCH=y
 BR2_KERNEL_ADD_PATCH=y
 BR2_KERNEL_MINORLEVEL="3"
 BR2_KERNEL_ARCH_PATCH_ENABLED=y
-BR2_ARCH_AVR32_2_6_27_6=y
-# BR2_ARCH_AVR32_2_6_25_10 is not set
-# BR2_ARCH_AVR32_2_6_24 is not set
+BR2_ARCH_AVR32_2_6_24=y
 # BR2_ARCH_AVR32_2_6_23 is not set
 # BR2_ARCH_AVR32_2_6_22_10 is not set
 # BR2_ARCH_AVR32_2_6_22_1 is not set
@@ -972,7 +905,9 @@ BR2_ARCH_AVR32_2_6_27_6=y
 BR2_LINUX_BSP_PATCH=""
 BR2_KERNEL_PATCH="patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2"
 BR2_EXTRA_VERSION=".$(BR2_KERNEL_PATCH_LEVEL)"
+# BR2_KERNEL_PREPATCHED is not set
 BR2_KERNEL_BASE=y
+# BR2_KERNEL_LATEST is not set
 BR2_DOWNLOAD_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
 BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)"

@@ -982,6 +917,9 @@ BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)"
 BR2_PACKAGE_LINUX_USE_KCONFIG=y
 # BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
 # BR2_PACKAGE_LINUX_USE_XCONFIG is not set
+BR2_MAKE_XCONFIG=y
+# BR2_MAKE_MENUCONFIG is not set
+BR2_KERNEL_CONFIG_METHOD="xconfig"
 # BR2_LINUX_BIN_BZIMAGE is not set
 BR2_LINUX_BIN_UIMAGE=y
 # BR2_LINUX_BIN_VMLINUX is not set
--- a/Show More
+++ b/Show More
				`@@ -1,2 +0,0 @@`
				`include target/device/Atmel/arch-arm/u-boot/Makefile.in`