buildroot: fix version for 2009.02-rc3

that the options become visible just below
the config, instead of at bottom of screen

Create a more useful default as toolchain path.

Allow generation of a script which sets up
paths to a binary toolchain generated by buildroot.

Config.in

@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
 	string
-	default "2009.02-rc2"
+	default "2009.02-rc3"
 
 source "target/Config.in.arch"
 source "target/device/Config.in"
@@ -69,6 +69,13 @@ config BR2_DL_DIR
 
 	  The default is $(BASE_DIR)/dl
 
+config BR2_COPYTO
+	string "Copy result to..."
+	default ""
+	help
+	  Setting this variable will (eventually) override 
+	  any other copyto configurations in buildroot.
+
 source	"target/device/Config.in.mirrors"
 
 config BR2_STAGING_DIR
@@ -236,14 +243,14 @@ choice
 
 config BR2_STRIP_strip
 	bool "strip"
-	depends on !BR2_ENABLE_DEBUG
+	depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT
 	help
 	  strip   is the normal strip command
 
 config BR2_STRIP_sstrip
 	bool "sstrip"
 	select BR2_PACKAGE_SSTRIP_HOST
-	depends on !BR2_ENABLE_DEBUG
+	depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT
 	help
 	  sstrip  is a strip that discards more than the normal strip
 

Makefile

@@ -40,6 +40,11 @@ else
 BR2_LOCAL:=$(TOPDIR)/local
 endif
 
+# Variables for use in Make constructs
+comma:=,
+empty:=
+space:=$(empty) $(empty)
+
 # $(shell find . -name *_defconfig |sed 's/.*\///')
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
@@ -127,9 +132,6 @@ HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
 HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
 HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
 HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
-HOST_GLIB_BIN:=`dirname $(shell which glib-genmarshal || echo /usr/bin/glib-genmarshal)`
-HOST_GLIB:=$(shell dirname $(HOST_GLIB_BIN) || echo /usr)
-
 
 ifndef CFLAGS_FOR_BUILD
 CFLAGS_FOR_BUILD:=-g -O2
@@ -211,7 +213,7 @@ BASE_TARGETS:=uclibc
 endif
 TARGETS:=
 
-# setup our pathes
+# setup our paths
 include project/Makefile.in
 
 BR2_DEPENDS_DIR=$(PROJECT_BUILD_DIR)/buildroot-config
@@ -471,14 +473,18 @@ clean:
 distclean: clean
 	rm -rf sources/*
 
+
 endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
+flush:
+	rm -f $(PROJECT_BUILD_DIR)/tgt-config.cache
+
 %_defconfig: $(CONFIG)/conf
 	cp $(shell find ./target/ -name $@) .config
 	-@$(MAKE) oldconfig
 
 update:
-	cp .config $(BOARD_PATH)/$(BOARD_NAME)_defconfig
+	cp .config $(BOARD_PATH)/$(PROJECT)_defconfig
 
 configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config
 
@@ -514,6 +520,7 @@ help:
 	@echo '  source                 - download all sources needed for offline-build'
 	@echo '  source-check           - check all packages for valid download URLs'
 	@echo '  external-deps          - list external packages used'
+	@echo '  flush                  - flush configuration cache'
 	@echo
 	@echo 'See docs/README and docs/buildroot.html for further details'
 	@echo

docs/buildroot.html

@@ -247,6 +247,10 @@
     <li>HOSTCC</li>
     <li>UCLIBC_CONFIG_FILE=&lt;path/to/.config&gt;</li>
     <li>BUSYBOX_CONFIG_FILE=&lt;path/to/.config&gt;</li>
+    <li>BUILDROOT_COPYTO</li>
+    <li>BUILDROOT_DL_DIR</li>
+    <li>BUILDROOT_LOCAL</li>
+    <li>BUILDROOT_USE_XWINDOWS</li>
     </ul>
 
     <p>An example that uses config files located in the toplevel directory and
@@ -261,6 +265,16 @@ $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config
 $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD
 </pre>
 
+    <p>If you want the result of your build to be copied to another directory
+    like /tftpboot for downloading to a board using tftp, then you
+    can use BUILDROOT_COPYTO to specify your location</p>
+    <p>Typically, this is set in your ~/.bashrc file
+
+<pre>
+$ export BUILDROOT_COPYTO=/tftpboot
+</pre>
+
+
     <h3><a name="helper_completion" id="helper_completion"></a>
     Using auto-completion</h3>
 
@@ -635,52 +649,22 @@ $ make me&lt;TAB&gt;
     conflicts, but will use unique build directories, where the user
     can configure the build. </p>
 
-    <p><b>THINGS TO DO</b></p>
-
+    <h2><a name="Linux" id="Linux"></a>Linux</h2>
     <ol>
 
-    <li>Linux</li>
 
-    <p>The current Linux implementation is flawed. It only works
-    if the user chooses to use one of the few kernels selected
-    as base for the kernel-headers. While the Makefile seems to have
-    hooks, allowing the developer to specify whatever version he/she
-    wants in the target/device/*/* Makefiles, the build will fail
-    if another kernel version is choosen.</p>
-
-    <p>The reason for this is that the kernel patches are not
-    applied by the <code>&quot;target/linux/linux.mk&quot;</code>
-    build script fragment. They are only applied by the
-    <code>&quot;toolchain/kernel-headers/*.makefile&quot;</code>
-    build script fragments</p>
-
-    <p>If the kernel-header version and the linux version differs,
-    there will be two <code>&quot;linux-2.6.X.Y&quot;</code>
-    directories in
-    <code>&quot;build_&lt;ARCH&gt;/&lt;&gt;&quot;</code>,
-    each with its own set of patches. </p>
-
-    <p>The solution in the works, is to move the build of Linux to
-    <code>&quot;project_build_&lt;ARCH&gt;/&lt;project name&gt;/linux-2.6.X.Y&quot;</code> combined with method to configure
-     which patches can be applied. Possibly, the linux source tree
-     used to generate the kernel headers will be moved to the
-     <code>&quot;toolchain_build_&lt;ARCH&gt;&quot;</code>
-     directory
-      </p>
-
-     <p>The user will be able to select from three different
-     Linux strategies:
+     <p>The user can select from three different Linux strategies:
 
      <ul>
-     <li>Conservative Strategy: Only use version ssupported by the kernel headers</li>
-     <li>Stable Linux Strategy: Allow any 2.6.X.Y combination.
+     <li>Legacy: Only use version supported by the kernel headers</li>
+     <li>Advanced: Allow any 2.6.X.Y combination.
 	(Minimum 2.6.19)</li>
      <li>Power-User Strategy: Allow
      <code>&quot;-git&quot;</code>, or
      <code>&quot;-mm&quot;</code>, or user downloadable kernels</li>
      </ul>
 
-     <p>The current kernel patches can be configured to be applied to the
+     <p>The current kernel patches can be applied to the
      linux source tree even if the version differs from the
      kernel header version. </p>
 
@@ -690,7 +674,7 @@ $ make me&lt;TAB&gt;
      proprietary kernel-patch or decide to not apply the kernel
      patches</p>
 
-     <p>Other optional patches will be <u>board specific</u> or
+     <p>There is also support for <u>board specific</u> and
      <u>architecture specific</u> patches. </p>
 
      <p>There will also be a way for the user to supply absolute
@@ -702,8 +686,17 @@ $ make me&lt;TAB&gt;
      <p>Maybe, there will also be a possibility to supply an
      <code>&quot;URL&quot;</code> to a patch available on Internet. </p>
 
-     <li>Configurable packages</li>
+     <p>
+	If there is no linux config file available,
+	buildroot starts the linux configuration system, which
+	defaults to "make menuconfig".
+     </p>
+    </ol>
 
+    <h2><a name="Todo" id="Todo"></a>Todo</h2>
+    <ol>
+
+     <li>Configurable packages</li>
      <p>Many packages can, on top of the simple
      &quot;enable/disable build&quot;,
      be further configured using Kconfig.

docs/news.html

@@ -3,6 +3,16 @@
 
 <ul>
 
+  <li><b>23 January 2009 -- 2009.02-rc2 released</b>
+    <p>Another week, another release candidate with a bunch of
+    cleanups and build fixes.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.02-rc2.tar.bz2">2009.02-rc2
+    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>.</p>
+
   <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>

package/Config.in

@@ -189,6 +189,7 @@ source "package/openvpn/Config.in"
 source "package/openswan/Config.in"
 source "package/portmap/Config.in"
 source "package/pppd/Config.in"
+source "package/radvd/Config.in"
 source "package/rp-pppoe/Config.in"
 source "package/pptp-linux/Config.in"
 source "package/proftpd/Config.in"

package/Makefile.autotools.in

@@ -38,6 +38,8 @@
 #	environment passed to the <configure> script
 # FOO_CONF_OPT [default empty]
 #	arguments passed to the <configure> script
+# FOO_MAKE [default $(MAKE)]
+#	command to use to execute <make>
 # FOO_MAKE_ENV [default empty]
 #	environment passed to all calls to <make> in the package source
 #	directory
@@ -257,13 +259,13 @@ $(BUILD_DIR)/%/.stamp_configured:
 # Build
 $(BUILD_DIR)/%/.stamp_built:
 	$(call MESSAGE,"Building")
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	$(Q)touch $@
 
 # Install to staging dir
 $(BUILD_DIR)/%/.stamp_staging_installed:
 	$(call MESSAGE,'Installing to host (staging directory)')
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 #	toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
 	for i in $$(find $(STAGING_DIR)/usr/lib/ -name "*.la"); do \
 		cp $$i $$i~; \
@@ -274,7 +276,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
 # Install to target dir
 $(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed:
 	$(call MESSAGE,"Installing to target")
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR)
 	$(if $(BR2_HAVE_MANPAGES),,for d in man share/man; do \
 		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
 	done)
@@ -288,14 +290,14 @@ $(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed:
 
 $(BUILD_DIR)/%/.stamp_cleaned:
 	$(call MESSAGE,"Cleaning up")
-	-$($(PKG)_MAKE_ENV) $(MAKE)  $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	-$($(PKG)_MAKE_ENV) $($(PKG)_MAKE)  $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	rm -f $(@D)/.stamp_built
 
 $(BUILD_DIR)/%/.stamp_uninstalled:
 	$(call MESSAGE,"Uninstalling")
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	rm -f $(@D)/.stamp_staging_installed
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	rm -f $($(PKG)_TARGET_INSTALL_TARGET) $($(PKG)_HOOK_POST_INSTALL)
 
 $(BUILD_DIR)/%/.stamp_dircleaned:
@@ -331,6 +333,7 @@ $(2)_LIBTOOL_PATCH		?= YES
 $(2)_USE_CONFIG_CACHE   ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPT			?=
+$(2)_MAKE			?= $(MAKE)
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
 $(2)_INSTALL_STAGING		?= NO

package/Makefile.in

@@ -88,6 +88,14 @@ ifeq ($(BR2_LARGEFILE),y)
 TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
+# Handle bug fixes in toolchain
+ifeq ($(BR2_arm),y)
+ifeq ($(BR2_GCC_VERSION_4_3_2),y)
+# Removes segment violation in mpg123.
+TARGET_CFLAGS+=-DARM_UNROLL_FIX
+endif
+endif
+
 TARGET_CXXFLAGS=$(TARGET_CFLAGS)
 
 # else it's an external toolchain

package/acpid/acpid-sign-warning.patch

@@ -1,11 +0,0 @@
---- acpid-1.0.4/ud_socket.c
-+++ acpid-1.0.4/ud_socket.c
-@@ -58,7 +58,7 @@ ud_accept(int listenfd, struct ucred *cr
- 	while (1) {
- 		int newsock = 0;
- 		struct sockaddr_un cliaddr;
--		int len = sizeof(struct sockaddr_un);
-+		socklen_t len = sizeof(struct sockaddr_un);
- 
- 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
- 		if (newsock < 0) {

package/acpid/acpid-socket-path.patch

@@ -1,11 +0,0 @@
---- acpid-1.0.4/acpid.h
-+++ acpid-1.0.4/acpid.h
-@@ -32,7 +32,7 @@
- #define ACPI_EVENTFILE		ACPI_PROCDIR "/event"
- #define ACPI_CONFDIR		"/etc/acpi/events"
- #define ACPI_LOGFILE		"/var/log/acpid"
--#define ACPI_SOCKETFILE		"/var/run/acpid.socket"
-+#define ACPI_SOCKETFILE		"/tmp/acpid.socket"
- #define ACPI_SOCKETMODE		0666
- #define ACPI_MAX_ERRS		5
- 

package/argus/Config.in

@@ -1,3 +1,6 @@
+comment "argus has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_ARGUS
+
 config BR2_PACKAGE_ARGUS
 	bool "argus"
 	select BR2_PACKAGE_LIBPCAP

package/autoconf/autoconf.mk

@@ -3,7 +3,7 @@
 # autoconf
 #
 #############################################################
-AUTOCONF_VERSION:=2.61
+AUTOCONF_VERSION:=2.63
 AUTOCONF_SOURCE:=autoconf-$(AUTOCONF_VERSION).tar.bz2
 AUTOCONF_SITE:=$(BR2_GNU_MIRROR)/autoconf
 AUTOCONF_CAT:=$(BZCAT)

package/avahi/avahi.mk

@@ -158,6 +158,7 @@ $(TARGET_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.installed
 	chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
 	cp -af package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
 	cp $(STAGING_DIR)/usr/sbin/avahi-autoipd $@
+	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
 	ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 

package/bind/Config.in

@@ -1,3 +1,6 @@
+comment "bind has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_BIND
+
 config BR2_PACKAGE_BIND
 	bool "bind"
 	help

package/busybox/busybox.mk

@@ -42,18 +42,10 @@ else
 endif
 	touch $@
 
-$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
+$(BUSYBOX_DIR)/.config: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
 	cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
 	$(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
 		$(BUSYBOX_DIR)/.config
-ifeq ($(BR2_BUSYBOX_VERSION_1_0_1),y)
-	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \
-		$(BUSYBOX_DIR)/Rules.mak
-endif
-ifeq ($(BR2_BUSYBOX_VERSION_1_1_3),y)
-	$(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
-		$(BUSYBOX_DIR)/.config
-endif
 ifeq ($(BR2_BUSYBOX_VERSION_1_2_2_1),y)
 	$(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
 		$(BUSYBOX_DIR)/.config
@@ -105,7 +97,7 @@ endif
 	touch $@
 
 
-$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
+$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) \
@@ -137,9 +129,9 @@ busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE)
 
 busybox-unpacked: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.unpacked
 
-busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.configured
+busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.config
 
-busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.configured
+busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.config
 	$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
 
 busybox-update:

package/cups/cups.mk

@@ -3,23 +3,59 @@
 # cups
 #
 ################################################################################
-CUPS_VERSION = 1.3.5
+CUPS_VERSION = 1.3.9
 CUPS_NAME = cups-$(CUPS_VERSION)
 CUPS_DIR = $(BUILD_DIR)/$(CUPS_NAME)
-CUPS_SITE = http://ftp.easysw.com/pub/cups/1.3.5
+CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
 CUPS_SOURCE:=$(CUPS_NAME)-source.tar.bz2
 CUPS_DESTDIR:=$(STAGING_DIR)/usr/lib
 CUPS_CAT:=$(BZCAT)
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
-        CUPS_CONF_OPT_DBUS =--enable-dbus
-        CUPS_DEPENDENCIES_DBUS = dbus
+	CUPS_CONF_OPT += --enable-dbus
+	CUPS_DEPENDENCIES += dbus
 else
-        CUPS_CONF_OPT_DBUS =--disable-dbus
+	CUPS_CONF_OPT += --disable-dbus
 endif
 
 ifneq ($(BR2_PACKAGE_XSERVER_none),y)
-        CUPS_DEPENDENCIES_X = xlib_libX11
+	CUPS_DEPENDENCIES += xlib_libX11
+endif
+
+CUPS_CONF_OPT +=	--disable-perl
+CUPS_CONF_OPT +=	--disable-java
+CUPS_CFLAGS = $(TARGET_CFLAGS)
+
+
+ifeq ($(BR2_PACKAGE_PERL),disabled)	# We do not provide perl (yet)
+	CUPS_CONF_ENV +=	ac_cv_path_perl=$(STAGING_DIR)/usr/bin/perl
+	CUPS_CONF_OPT +=	--with-perl
+	CUPS_DEPENDENCIES +=	microperl
+else
+	CUPS_CONF_OPT +=	--disable-perl
+endif
+
+ifeq ($(BR2_PACKAGE_PHP),y)
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/main
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/regex
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/TSRM
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/Zend
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/ext
+	CUPS_CONF_ENV +=	ac_cv_path_php=$(STAGING_DIR)/usr/bin/php
+	CUPS_CONF_OPT +=	--with-php
+	CUPS_DEPENDENCIES +=	php
+else
+	CUPS_CONF_OPT +=	--disable-php
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
+	CUPS_CONF_ENV +=	ac_cv_path_python=$(STAGING_DIR)/usr/bin/python
+	CUPS_CONF_OPT +=	--with-python
+	CUPS_DEPENDENCIES +=	python
+else
+	CUPS_CONF_OPT +=	--disable-python
 endif
 
 $(DL_DIR)/$(CUPS_SOURCE):
@@ -35,13 +71,25 @@ $(CUPS_DIR)/.configured: $(CUPS_DIR)/.unpacked
 	(cd $(CUPS_DIR) && \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
+		$(CUPS_CONF_ENV) \
+		CFLAGS="$(CUPS_CFLAGS)" \
 		./configure \
-		--prefix=/usr $(CUPS_CONF_OPT_DBUS) --includedir=/usr/include  \
-		--libdir=/usr/lib --disable-gnutls --disable-gssapi --host=$(ARCH) \ )
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-config-file-path=/etc \
+		--disable-gnutls \
+		--disable-gssapi \
+		$(CUPS_CONF_OPT) \
+		)
 	touch $@
 
 $(CUPS_DIR)/.compiled: $(CUPS_DIR)/.configured
-	$(MAKE) -C $(CUPS_DIR) cups backend berkeley cgi-bin filter \
+	$(MAKE) CFLAGS="$(CUPS_CFLAGS)" -C $(CUPS_DIR) cups backend berkeley cgi-bin filter \
 	locale monitor notifier pdftops scheduler systemv scripting/php \
 	conf data doc fonts ppd templates
 	touch $@
@@ -55,11 +103,14 @@ $(CUPS_DIR)/.installed: $(CUPS_DIR)/.compiled
 	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/cups-config
 	touch $@
 
-cups: uclibc $(CUPS_DEPENDENCIES_DBUS) $(CUPS_DEPENDENCIES_X) $(CUPS_DIR)/.installed
+cups: uclibc $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed
 
 cups-clean:
 	-$(MAKE) -C $(CUPS_DIR) clean
 
+cups-dirclean:
+	rm -fr $(CUPS_DIR)
+
 #############################################################
 #
 # Toplevel Makefile options
@@ -67,4 +118,5 @@ cups-clean:
 #############################################################
 ifeq ($(BR2_PACKAGE_CUPS),y)
 TARGETS+=cups
-endif
+endif
+

package/database/mysql_client/Config.in

@@ -1,4 +1,10 @@
 config BR2_PACKAGE_MYSQL_CLIENT
 	bool "MySQL 5.1 client"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
 	help
 	  MySQL client
+
+comment "Mysql client requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP

package/database/mysql_client/mysql_client.mk

@@ -8,23 +8,24 @@ MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://mirrors.24-7-solutions.net/pub/mysql/Downloads/MySQL-5.1
 MYSQL_CLIENT_INSTALL_TARGET = YES
 MYSQL_CLIENT_INSTALL_STAGING = YES
-MYSQL_CLIENT_DEPENDENCIES = uclibc readline
+MYSQL_CLIENT_DEPENDENCIES = uclibc readline ncurses
 
 MYSQL_CLIENT_CONF_ENV = ac_cv_sys_restartable_syscalls=yes
 MYSQL_CLIENT_CONF_OPT = \
-	--target=$(GNU_TARGET_NAME) \
-	--host=$(GNU_TARGET_NAME) \
-	--build=$(GNU_HOST_NAME) \
 	--program-prefix="" \
-	--prefix=/usr \
 	--without-ndb-binlog \
 	--without-server \
 	--without-docs \
 	--without-man \
 	--without-readline \
 	--without-libedit \
+	--with-readline=$(STAGING_DIR)/usr \
 	--with-low-memory \
 	--enable-thread-safe-client \
 	$(ENABLE_DEBUG)
 
 $(eval $(call AUTOTARGETS,package/database,mysql_client))
+
+$(MYSQL_CLIENT_HOOK_POST_INSTALL):
+	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
+	touch $@

package/database/sqlite/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_SQLITE
 	bool "sqlite"
 	select BR2_PACKAGE_NCURSES
-	select BR2_READLINE
+	select BR2_PACKAGE_READLINE
 	help
 	  SQLite is a small C library that implements a self-contained,
 	  embeddable, zero-configuration SQL database engine.

package/database/sqlite/sqlite.mk

@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION:=3.6.4
+SQLITE_VERSION:=3.6.10
 SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE:=http://www.sqlite.org
 SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
@@ -55,7 +55,7 @@ $(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3
 	cp -dpf $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so
 
-sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3
+sqlite: uclibc ncurses $(TARGET_DIR)/usr/bin/sqlite3
 
 sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
 

package/dbus/dbus.mk

@@ -13,14 +13,10 @@ DBUS_TARGET_BINARY:=usr/bin/dbus-daemon
 
 ifeq ($(BR2_DBUS_EXPAT),y)
 DBUS_XML:=expat
-# depend on the exact library file instead of expat so dbus isn't always
-# considered out-of-date
-DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
+DBUS_XML_DEP:=expat
 else
 DBUS_XML:=libxml
-# Makefile.autotools.in unfortunately has broken dependency handling,
-# so we cannot do the same for libxml2
-DBUS_XML_DEP:=libxml2-install-staging
+DBUS_XML_DEP:=libxml2
 endif
 
 $(DL_DIR)/$(DBUS_SOURCE):
@@ -64,9 +60,12 @@ $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
 
 $(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
 	$(MAKE) -C $(DBUS_DIR) all
+	touch $@
 
 $(STAGING_DIR)/$(DBUS_TARGET_BINARY): $(DBUS_DIR)/$(DBUS_BINARY)
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR) install
+	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdbus-1.la
+	touch $@
 
 $(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/$(DBUS_TARGET_BINARY)
 	mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/var/lib/dbus $(TARGET_DIR)/etc/init.d
@@ -87,7 +86,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y)
 	rm -rf $(TARGET_DIR)/usr/share/man
 endif
 
-dbus: uclibc pkgconfig $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
+dbus: uclibc pkgconfig $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
 
 dbus-clean:
 	rm -f $(TARGET_DIR)/etc/dbus-1/session.conf
@@ -114,3 +113,5 @@ dbus-dirclean:
 ifeq ($(BR2_PACKAGE_DBUS),y)
 TARGETS+=dbus
 endif
+
+

package/directfb/directfb.mk

@@ -52,9 +52,6 @@ endif
 ifeq ($(DIRECTFB_GFX),)
 DIRECTFB_GFX:=none
 else
-comma:=,
-empty:=
-space:=$(empty) $(empty)
 DIRECTFB_GFX:=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
 endif
 
@@ -75,9 +72,6 @@ endif
 ifeq ($(DIRECTFB_INPUT),)
 DIRECTFB_INPUT:=none
 else
-comma:=,
-empty:=
-space:=$(empty) $(empty)
 DIRECTFB_INPUT:=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
 endif
 

package/dmraid/Config.in

@@ -1,3 +1,6 @@
+comment "dmraid has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_DMRAID
+
 config BR2_PACKAGE_DMRAID
 	bool "dmraid"
 	select BR2_PACKAGE_DM

package/freetype/freetype.mk

@@ -4,13 +4,14 @@
 #
 #############################################################
 FREETYPE_VERSION = $(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
+#"))
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_LIBTOOL_PATCH = NO
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_INSTALL_TARGET = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = uclibc pkgconfig zlib
+FREETYPE_DEPENDENCIES = uclibc pkgconfig $(if $(BR2_PACKAGE_ZLIB),zlib)
 
 $(eval $(call AUTOTARGETS,package,freetype))
 

package/gamin/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GAMIN
 	bool "gamin"
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  the File Alteration Monitor
 

package/gamin/gamin.mk

@@ -10,13 +10,17 @@ GAMIN_AUTORECONF = NO
 GAMIN_INSTALL_STAGING = YES
 GAMIN_INSTALL_TARGET = YES
 
-GAMIN_CONF_OPT = --program-prefix=""
+GAMIN_CONF_OPT = --program-prefix="" --disable-debug
 
 GAMIN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
 GAMIN_CONF_ENV = have_abstract_sockets=no
 
-GAMIN_DEPENDENCIES = uclibc libgtk2
+ifneq ($(BR2_LARGEFILE),y)
+GAMIN_CONF_ENV += CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
+endif
+
+GAMIN_DEPENDENCIES = uclibc libglib2
 
 $(eval $(call AUTOTARGETS,package,gamin))
 

package/icu/Config.in

@@ -1,4 +1,11 @@
 config BR2_PACKAGE_ICU
 	bool "icu"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
 	help
 	  International Components for Unicode.
+
+	  http://icu-project.org/
+
+comment "icu requires a toolchain with C++ support and WCHAR enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR

package/ipsec-tools/Config.in

@@ -51,7 +51,7 @@ config BR2_PACKAGE_IPSEC_TOOLS_IPV6
 
 config BR2_PACKAGE_IPSEC_TOOLS_READLINE
 	depends on BR2_PACKAGE_IPSEC_TOOLS
-	select BR2_READLINE
+	select BR2_PACKAGE_READLINE
 	bool "Enable readline input support if available."
 
 config BR2_PACKAGE_IPSEC_TOOLS_LIBS

package/irda-utils/Config.in

@@ -1,7 +1,9 @@
 menuconfig BR2_PACKAGE_IRDA_UTILS
 	bool "irda_utils"
+	depends on BROKEN
 	help
-		Tools for accessing the irda-Subsystem of the Linux-Kernel
+	  Tools for accessing the irda-Subsystem of the Linux-Kernel
+	  The makefile is totally broken.
 
 if BR2_PACKAGE_IRDA_UTILS
 config IRDA_IRATTACH
@@ -39,5 +41,5 @@ config IRDA_SMCINIT
 	help
 		Some Toshiba Laptops have buggy BIOSes which didn't initialize
 		Irda. This may help those.
-	
+
 endif

package/kismet/Config.in

@@ -1,3 +1,6 @@
+comment "kismet has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_KISMET
+
 config BR2_PACKAGE_KISMET
 	bool "kismet"
 	select BR2_PACKAGE_NCURSES

package/libcgicc/Config.in

@@ -1,8 +1,11 @@
 config BR2_PACKAGE_LIBCGICC
 	bool "libcgicc"
-	select BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  GNU cgicc is a C++ class library that greatly simplifies
 	  the creation of CGI applications for the World Wide Web.
 
 	  http://www.cgicc.com
+
+comment "libcgicc requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP

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=\"\">"; 

package/libcgicc/libcgicc.mk

@@ -30,16 +30,9 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
 		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
-		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
+		--disable-demos \
 	)
 	touch $@
 
@@ -47,12 +40,12 @@ $(LIBCGICC_DIR)/.compiled: $(LIBCGICC_DIR)/.configured
 	$(MAKE) -C $(LIBCGICC_DIR)
 	touch $@
 
-$(STAGING_DIR)/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled
+$(STAGING_DIR)/usr/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install
-	touch -c $(STAGING_DIR)/lib/libcgicc.so
+	touch -c $(STAGING_DIR)/usr/lib/libcgicc.so
 
-$(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/lib/libcgicc.so
-	cp -dpf $(STAGING_DIR)/lib/libcgicc.so* $(TARGET_DIR)/usr/lib/
+$(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/usr/lib/libcgicc.so
+	cp -dpf $(STAGING_DIR)/usr/lib/libcgicc.so* $(TARGET_DIR)/usr/lib/
 
 libcgicc: uclibc $(TARGET_DIR)/usr/lib/libcgicc.so
 

package/libdnet/libdnet.mk

@@ -10,7 +10,12 @@ LIBDNET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/l
 LIBDNET_INSTALL_STAGING = YES
 LIBDNET_INSTALL_TARGET = YES
 LIBDNET_AUTORECONF = YES
-LIBDNET_CONF_OPT = --with-gnu-ld --enable-shared --enable-static
+LIBDNET_CONF_OPT = \
+	--with-gnu-ld \
+	--enable-shared \
+	--enable-static \
+	--with-check=no
+
 LIBDNET_DEPENDENCIES = uclibc
 
 ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)

package/libeXosip2/Config.in

@@ -1,3 +1,6 @@
+comment "libeXosip2 has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_LIBEXOSIP2
+
 config BR2_PACKAGE_LIBEXOSIP2
 	bool "libeXosip2"
 	select BR2_PACKAGE_LIBOSIP2

package/libeXosip2/libeXosip2.mk

@@ -26,16 +26,12 @@ $(LIBEXOSIP2_DIR)/.configured: $(LIBEXOSIP2_DIR)/.unpacked
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--prefix=$(STAGING_DIR) \
+		--prefix=/usr \
 		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--libexecdir=/usr/lib \
 		--libdir=/usr/lib \
 		--includedir=$(STAGING_DIR)/usr/include \
 		--oldincludedir=/usr/include \

package/libfloat/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBFLOAT
 	bool "libfloat"
+	depends on BR2_DEPRECATED
 	help
 	 Soft floating point library.
 	

package/libglib2/libglib2.mk

@@ -14,6 +14,10 @@ LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_TARGET = YES
 LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
+# detect install prefix of host glib development stuff
+HOST_GLIB_BIN:=`dirname $(shell which glib-genmarshal || echo /usr/bin/glib-genmarshal)`
+HOST_GLIB:=$(shell dirname $(HOST_GLIB_BIN) || echo /usr)
+
 LIBGLIB2_CONF_ENV =	\
 		ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no ac_cv_func_strtod=yes \
@@ -62,3 +66,10 @@ LIBGLIB2_DEPENDENCIES+=libiconv
 endif
 
 $(eval $(call AUTOTARGETS,package,libglib2))
+
+# we NEED a host glib-genmarshal
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+ifeq ($(wildcard $(HOST_GLIB)/bin/glib-genmarshal),)
+$(error Host glib-genmarshal not found. Please install glib development package on your host (something like libglib2.0-dev))
+endif
+endif

package/liboil/liboil.mk

@@ -26,6 +26,8 @@ ifeq ($(BR2_x86_64),y)
 LIBOIL_CONF_ENV = as_cv_unaligned_access=yes
 endif
 
+LIBOIL_CONF_OPT+=--with-gnu-ld
+
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
 LIBOIL_GLIB_DEP = libglib2
 endif

package/libsexy/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBSEXY
 	bool "libsexy"
 	depends on BR2_PACKAGE_LIBGTK2
-	depends on !BR2_PACKAGE_XSERVER_none
+	select BR2_PACKAGE_LIBXML2
 	help
 	  libsexy is a collection of GTK+ widgets that extend the
 	  functionality of such standard widgets as GtkEntry and
@@ -9,7 +9,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
-

package/libsexy/libsexy.mk

@@ -8,7 +8,7 @@ LIBSEXY_VERSION = 0.1.11
 LIBSEXY_SOURCE = libsexy-$(LIBSEXY_VERSION).tar.gz
 LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy/
 LIBSEXY_AUTORECONF = NO
-LIBSEXY_DEPENDENCIES = xlib_libX11 libgtk2
+LIBSEXY_DEPENDENCIES = libgtk2 libxml2
 LIBSEXY_INSTALL_TARGET = YES
 LIBSEXY_INSTALL_STAGING = YES
 

package/libxml2/libxml2.mk

@@ -25,6 +25,7 @@ $(eval $(call AUTOTARGETS,package,libxml2))
 $(LIBXML2_HOOK_POST_EXTRACT):
 	rm -f $(LIBXML2_DIR)/win32/Makefile.msvc.rej
 	rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
+	touch $@
 
 $(LIBXML2_HOOK_POST_INSTALL):
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config

package/ltrace/Config.in

@@ -1,3 +1,6 @@
+comment "ltrace has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_LTRACE
+
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
 	#depends on BR2_LARGEFILE

package/ltt/Config.in

@@ -1,7 +1,10 @@
 config BR2_PACKAGE_LTT
 	bool "LTT (Linux Trace Toolkit)"
+	depends on BR2_DEPRECATED
 	help
 	  A suite of tools designed to extract program execution
 	  details from the Linux operating system and interpret them.
 
 	  http://www.opersys.com/LTT/
+	  The package is obsolete and has been replaced by ltt-ng
+

package/lua/Config.in

@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUA
 	bool "lua"
-	select BR2_READLINE
+	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_NCURSES
 	help
 	  Lua is a powerful, fast, light-weight, embeddable scripting language.

package/microperl/microperl.mk

@@ -23,18 +23,38 @@ $(DL_DIR)/$(MICROPERL_SOURCE):
 
 $(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE)
 	$(MICROPERL_CAT) $(DL_DIR)/$(MICROPERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	chmod -R u+w $(MICROPERL_DIR)
 	touch $@
 
-$(MICROPERL_DIR)/.configured: $(MICROPERL_DIR)/.source
-ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
+$(MICROPERL_DIR)/.host_configured: $(MICROPERL_DIR)/.source
 	# we need to build a perl for the host just for Errno.pm
-	(cd $(MICROPERL_DIR); ./Configure -de; \
-	 $(MAKE) CC="$(HOSTCC)"; \
-	 $(SHELL) ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))"; \
+	(cd $(MICROPERL_DIR); ./Configure -Dcc=$(HOSTCC) -de  )
+	touch $@
+
+
+$(MICROPERL_DIR)/.host_configured_and_fixed: $(MICROPERL_DIR)/.host_configured
+	$(SED) 's/^.*<command-line>.*//g' $(MICROPERL_DIR)/makefile
+	$(SED) 's/^.*<command-line>.*//g' $(MICROPERL_DIR)/x2p/makefile
+	touch $@
+
+$(MICROPERL_DIR)/.host_make: $(MICROPERL_DIR)/.host_configured_and_fixed
+	$(MAKE) -C $(MICROPERL_DIR)		|| echo "An error is expected on make"
+	touch $@
+
+$(MICROPERL_DIR)/.host_make_fixed: $(MICROPERL_DIR)/.host_make
+	$(SED) 's#^.*<asm/page.h>.*##g' $(MICROPERL_DIR)/ext/IPC/SysV/SysV.c
+	$(MAKE) -C $(MICROPERL_DIR) test	|| echo "An error is expected on make test"
+	touch $@
+
+$(MICROPERL_DIR)/.configured: $(MICROPERL_DIR)/.host_make_fixed
+	# we need to build a perl for the host just for Errno.pm
+	(cd $(MICROPERL_DIR); \
+	 chmod a+x ext/util/make_ext; \
+	 ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))" \
 	)
-endif
-	(cd $(MICROPERL_DIR); chmod u+w uconfig.h; . ./uconfig.sh; \
-	 $(MAKE) -f Makefile.micro regen_uconfig; \
+	(cd $(MICROPERL_DIR); \
+	 chmod u+w uconfig.h; ./uconfig.sh; \
+	 $(MAKE) -f $(MICROPERL_DIR)/Makefile.micro regen_uconfig; \
 	 $(SED) 's,PRIVLIB ".*,PRIVLIB "/$(MICROPERL_MODS_DIR)",' \
 		 -e 's,PRIVLIB_EXP ".*,PRIVLIB_EXP "$(MICROPERL_MODS_DIR)",' \
 		 -e 's,BIN ".*,BIN "/usr/bin",' \
@@ -43,7 +63,7 @@ endif
 	touch $@
 
 $(MICROPERL_DIR)/microperl: $(MICROPERL_DIR)/.configured
-	$(MAKE) -f Makefile.micro CC=$(TARGET_CC) \
+	$(MAKE) -f $(MICROPERL_DIR)/Makefile.micro CC=$(TARGET_CC) \
 		OPTIMIZE="$(TARGET_CFLAGS)" -C $(MICROPERL_DIR)
 ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
 	#(cd $(@D); \
@@ -58,7 +78,7 @@ ifneq ($(MICROPERL_MODS),)
 		[ -d $$i ] || mkdir -p $$i; \
 	 done; \
 	 for i in $(MICROPERL_MODS); do \
-	 cp -dpf lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
+	 cp -dpf $(MICROPERL_DIR)/lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
 	 done; \
 	)
 endif
@@ -69,6 +89,14 @@ microperl: uclibc $(TARGET_DIR)/usr/bin/microperl
 
 microperl-source: $(DL_DIR)/$(MICROPERL_SOURCE)
 
+microperl-unpacked: $(MICROPERL_DIR)/.source
+
+microperl-config: $(MICROPERL_DIR)/.host_configured
+
+microperl-host: $(MICROPERL_DIR)/.host_make
+
+microperl-host-fixed: $(MICROPERL_DIR)/.host_make_fixed
+
 microperl-clean:
 	rm -rf $(TARGET_DIR)/usr/bin/microperl \
 		$(TARGET_DIR)/$(MICROPERL_MODS_DIR) $(TARGET_DIR)/usr/bin/perl

package/modutils/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MODUTILS
 	bool "modutils"
 	depends on !BR2_PACKAGE_MODULE_INIT_TOOLS
+	depends on BR2_DEPRECATED
 	help
 	  The modutils packages includes the kerneld program for automatic
 	  loading and unloading of modules, as well as other module

package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch

@@ -0,0 +1,91 @@
+diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h alsa-lib-1.0.18/src/pcm/pcm_local.h
+--- alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h	2009-01-31 11:02:12.000000000 +0100
++++ alsa-lib-1.0.18/src/pcm/pcm_local.h	2009-01-31 11:03:24.000000000 +0100
+@@ -611,6 +611,13 @@
+ 			   snd_pcm_hw_param_t var);
+ int _snd_pcm_hw_param_set(snd_pcm_hw_params_t *params,
+ 			  snd_pcm_hw_param_t var, unsigned int val, int dir);
++
++#if	defined(AVR32_INLINE_BUG)
++int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
++						snd_pcm_format_t val);
++int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
++				     snd_pcm_subformat_t val);
++#else
+ static inline int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
+ 						snd_pcm_format_t val)
+ {
+@@ -624,7 +631,7 @@
+ 	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
+ 				     (unsigned long) val, 0);
+ }
+-
++#endif
+ int _snd_pcm_hw_param_set_min(snd_pcm_hw_params_t *params,
+ 			      snd_pcm_hw_param_t var, unsigned int val, int dir);
+ int _snd_pcm_hw_param_set_max(snd_pcm_hw_params_t *params,
+diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c alsa-lib-1.0.18/src/pcm/pcm_route.c
+--- alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c	2009-01-31 11:02:12.000000000 +0100
++++ alsa-lib-1.0.18/src/pcm/pcm_route.c	2009-01-31 11:03:18.000000000 +0100
+@@ -26,6 +26,7 @@
+  *
+  */
+   
++
+ #include <byteswap.h>
+ #include <math.h>
+ #include "pcm_local.h"
+@@ -106,6 +107,23 @@
+ 
+ #endif /* DOC_HIDDEN */
+ 
++
++#if	defined(AVR32_INLINE_BUG)
++int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
++						snd_pcm_format_t val)
++{
++	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_FORMAT,
++				     (unsigned long) val, 0);
++}
++
++int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
++				     snd_pcm_subformat_t val)
++{
++	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
++				     (unsigned long) val, 0);
++}
++#endif
++
+ static void snd_pcm_route_convert1_zero(const snd_pcm_channel_area_t *dst_area,
+ 					snd_pcm_uframes_t dst_offset,
+ 					const snd_pcm_channel_area_t *src_areas ATTRIBUTE_UNUSED,
+@@ -483,6 +501,8 @@
+ 				  snd_pcm_uframes_t frames,
+ 				  snd_pcm_route_params_t *params)
+ {
++#if	defined(AVR32_INLINE_BUG)
++#endif
+ 	unsigned int dst_channel;
+ 	snd_pcm_route_ttable_dst_t *dstp;
+ 	const snd_pcm_channel_area_t *dst_area;
+@@ -551,8 +571,20 @@
+ 	_snd_pcm_hw_param_set_mask(sparams, SND_PCM_HW_PARAM_ACCESS,
+ 				   &saccess_mask);
+ 	if (route->sformat != SND_PCM_FORMAT_UNKNOWN) {
++#if	defined(AVR32_INLINE_BUG)
++/* Start of  of problem */
++#endif
+ 		_snd_pcm_hw_params_set_format(sparams, route->sformat);
+ 		_snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);
++#if	0
++		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_FORMAT,
++				     (unsigned long) route->sformat, 0);
++		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_SUBFORMAT,
++				     (unsigned long) SND_PCM_SUBFORMAT_STD, 0);
++#endif
++#if	defined(AVR32_INLINE_BUG)
++/* End of problem */
++#endif
+ 	}
+ 	if (route->schannels >= 0) {
+ 		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_CHANNELS,

package/multimedia/alsa-lib/alsa-lib-1.0.18-fix-off_t-in-kernel-struct.patch

@@ -0,0 +1,30 @@
+From c821f2e7f2534ece24a10402df3f501536a09cbd Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 28 Jan 2009 15:00:35 +0100
+Subject: [PATCH] Fix off_t in kernel struct
+
+The off_t in kernel struct (for ioctls) is actually different from the
+definition of user-space off_t.  The kernel off_t is equial with long
+while user-space off_t depends on the large-file support.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ include/sound/asound.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/sound/asound.h b/include/sound/asound.h
+index 977b2d6..62d1e57 100644
+--- a/include/sound/asound.h
++++ b/include/sound/asound.h
+@@ -402,7 +402,7 @@ struct sndrv_pcm_sw_params {
+ 
+ struct sndrv_pcm_channel_info {
+ 	unsigned int channel;
+-	off_t offset;			/* mmap offset */
++	long offset;			/* mmap offset */
+ 	unsigned int first;		/* offset to first sample in bits */
+ 	unsigned int step;		/* samples distance in bits */
+ };
+-- 
+1.5.6.5
+

package/multimedia/alsa-lib/alsa-lib.mk

@@ -12,9 +12,15 @@ ALSA_LIB_BINARY:=libasound.so.2.0.0
 ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY)
 
 ifeq ($(BR2_arm),y)
-ALSA_LIB_ABI:=-mabi=aapcs-linux
+ALSA_LIB_ABI+=-mabi=aapcs-linux
 else
-ALSA_LIB_ABI:=
+ALSA_LIB_ABI+=
+endif
+
+ifeq ($(BR2_avr32),y)
+ALSA_LIB_ABI+=-DAVR32_INLINE_BUG
+else
+ALSA_LIB_ABI+=
 endif
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
@@ -77,7 +83,9 @@ $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY
 
 alsa-lib: uclibc $(ALSA_LIB_DEPS) $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)
 
-alsa-lib-source: $(DL_DIR)/$(ALSA-LIB_SOURCE)
+alsa-lib-unpacked: $(ALSA_LIB_DIR)/.unpacked
+
+alsa-lib-source: $(DL_DIR)/$(ALSA_LIB_SOURCE)
 
 alsa-lib-clean:
 	rm -f $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)

package/multimedia/asterisk/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ASTERISK
 	bool "asterisk"
+	depends on BROKEN
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_PACKAGE_OPENSSL
@@ -10,3 +11,4 @@ config BR2_PACKAGE_ASTERISK
 comment "asterisk	- disabled (required openssl and mpg123)"
 	depends on !BR2_PACKAGE_OPENSSL || ! BR2_PACKAGE_MPG123
 
+

package/multimedia/asterisk/asterisk_no_res_ninit.patch

@@ -1,12 +0,0 @@
-diff -ur /tmp/asterisk-1.2.0-beta1/dns.c asterisk-1.2.0-beta1/dns.c
---- /tmp/asterisk-1.2.0-beta1/dns.c	2005-08-14 04:23:33.000000000 +0200
-+++ asterisk-1.2.0-beta1/dns.c	2005-08-31 09:42:36.000000000 +0200
-@@ -157,7 +157,7 @@
- 	return 0;
- }
- 
--#if defined(res_ninit)
-+#if (defined(res_ninit) && !defined(__UCLIBC__))
- #define HAS_RES_NINIT
- #else
- AST_MUTEX_DEFINE_STATIC(res_lock);

package/multimedia/mpg123/Config.in

@@ -10,3 +10,4 @@ config BR2_PACKAGE_MPG123_ALSA
 	bool
 	default y
 	depends on BR2_PACKAGE_ALSA_LIB
+

package/multimedia/mpg123/mpg123-0.59r-cross.patch

@@ -1,44 +0,0 @@
-diff -ruN mpg123-0.59r.orig/Makefile mpg123-0.59r/Makefile
---- mpg123-0.59r.orig/Makefile	1999-06-15 22:39:06.000000000 +0200
-+++ mpg123-0.59r/Makefile	2006-12-14 15:52:44.000000000 +0100
-@@ -103,14 +103,14 @@
-         mpg123-make
- 
- linux:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE) LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
- 			audio_oss.o term.o' \
- 		CFLAGS='-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
- 			-DREAD_MMAP -DOSS -DTERM_CONTROL\
--			-Wall -O2 -m486 \
-+			-Wall \
- 			-fomit-frame-pointer -funroll-all-loops \
--			-finline-functions -ffast-math' \
-+			-finline-functions -ffast-math $(CFLAGS)' \
- 		mpg123-make
- 
- linux-3dnow:
-@@ -246,6 +246,22 @@
- 			-finline-functions -ffast-math' \
- 		mpg123-make
- 
-+linux-bigend:
-+	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-+		CFLAGS+='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
-+			-DOSS -DOSS_BIG_ENDIAN -Wall \
-+			-fomit-frame-pointer -funroll-loops \
-+			-finline-functions -ffast-math $(CFLAGS)' \
-+		mpg123-make
-+
-+linux-littleend:
-+	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-+		CFLAGS='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
-+			-DOSS -Wall \
-+			-fomit-frame-pointer -funroll-loops \
-+			-finline-functions -ffast-math $(CFLAGS)' \
-+		mpg123-make
-+
- linux-sajber:
- 	@ $(MAKE) FRONTEND=sajberplay-make linux-frontend
- 

package/multimedia/mpg123/mpg123.mk

@@ -18,6 +18,10 @@ MPG123_USE_ALSA:=--with-audio=alsa
 MPG123_ALSA_DEP:=alsa-lib
 endif
 
+ifeq ($(BR2_PACKAGE_MPG123_ARM_UNROLL_FIX),y)
+MPG123_ARM_UNROLL_FIX:= -DMPG123_ARM_UNROLL_FIX
+endif
+
 $(DL_DIR)/$(MPG123_SOURCE):
 	$(call DOWNLOAD,$(MPG123_SITE),$(MPG123_SOURCE))
 
@@ -31,7 +35,7 @@ $(MPG123_DIR)/.configured: $(MPG123_DIR)/.unpacked
 	(cd $(MPG123_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		CFLAGS="$(TARGET_CFLAGS) $(MPG123_ARM_UNROLL_FIX)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
 		./configure \
 		--target=$(REAL_GNU_TARGET_NAME) \
@@ -55,6 +59,11 @@ $(TARGET_DIR)/$(MPG123_TARGET_BIN): $(MPG123_DIR)/$(MPG123_BIN)
 
 mpg123: uclibc $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
 
+mpg123x: 
+	touch $(MPG123_DIR)/.configured
+
+mpg123-unpacked: $(MPG123_DIR)/.unpacked
+
 mpg123-clean:
 	-$(MAKE) -C $(MPG123_DIR) clean
 

package/multimedia/mplayer/mplayer-1.0rc1-remove-sys-timeb.patch

@@ -0,0 +1,12 @@
+win32.c:67:23: error: sys/timeb.h: No such file or directory
+
+--- a/loader/win32.c	2009-01-26 01:53:20.000000000 +0100
++++ b/loader/win32.c	2009-01-26 01:53:39.000000000 +0100
+@@ -64,7 +64,6 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <sys/time.h>
+-#include <sys/timeb.h>
+ #ifdef	HAVE_KSTAT
+ #include <kstat.h>
+ #endif

package/multimedia/mplayer/mplayer.mk

@@ -25,6 +25,11 @@ else
 MPLAYER_LARGEFILE:=--disable-largefiles
 endif
 
+ifeq ($(BR2_i386),y)
+# This seems to be required to compile some of the inline asm
+MPLAYER_CFLAGS:=-fomit-frame-pointer
+endif
+
 $(DL_DIR)/$(MPLAYER_SOURCE):
 	$(call DOWNLOAD,$(MPLAYER_SITE),$(MPLAYER_SOURCE))
 
@@ -38,7 +43,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
 	(cd $(MPLAYER_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		CFLAGS="$(TARGET_CFLAGS) $(MPLAYER_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
 		./configure \
 		--prefix=/usr \

package/ncftp/Config.in

@@ -32,9 +32,11 @@ config BR2_PACKAGE_NCFTP_BATCH
 config BR2_PACKAGE_NCFTP_SPOOLER
 	bool "NcFTPSpooler - spooler - not working properly"
 	depends on BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCURSES
 
 config BR2_PACKAGE_NCFTP_BOOKMARKS
-	bool "NcFTPBookmarks - not working properly"
+	bool "NcFTPBookmarks"
 	depends on BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCURSES
 
 endmenu

package/ncftp/ncftp.mk

@@ -26,15 +26,20 @@ ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y)
 NCFTP_TARGET_BINS+=ncftpbatch
 endif
 
+ifeq ($(BR2_PACKAGE_NCURSES),y)
 ifeq ($(BR2_PACKAGE_NCFTP_SPOOLER),y)
 #Someone needs to figure out what to do...
 NCFTP_TARGET_BINS+=
 endif
 
+# only set if NCURSES is available
 ifeq ($(BR2_PACKAGE_NCFTP_BOOKMARKS),y)
 NCFTP_TARGET_BINS+=ncftpbookmarks
 endif
 
+NCFTP_DEPS += ncurses
+endif
+
 ncftp-source: $(DL_DIR)/$(NCFTP_SOURCE)
 
 $(DL_DIR)/$(NCFTP_SOURCE):
@@ -64,7 +69,7 @@ $(TARGET_DIR)/usr/bin/ncftp $(TARGET_DIR)/usr/bin/ncftp%: $(addprefix $(NCFTP_DI
 	$(INSTALL) -m 0755 $(NCFTP_DIR)/bin/$(notdir $@) $(TARGET_DIR)/usr/bin
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
 
-ncftp: uclibc $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS))
+ncftp: uclibc $(NCFTP_DEPS) $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS))
 
 ncftp-clean:
 	-$(MAKE) -C $(NCFTP_DIR) clean

package/ncurses/ncurses.mk

@@ -130,7 +130,9 @@ endif
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 	touch -c $@
 
-$(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
+$(NCURSES_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+
+$(TARGET_DIR)/usr/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.a
 	mkdir -p $(TARGET_DIR)/usr/include
 	cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/curses.h
 	cp -dpf $(NCURSES_DIR)/include/ncurses_dll.h $(TARGET_DIR)/usr/include/ncurses_dll.h

package/ntfs-3g/Config.in

@@ -1,3 +1,6 @@
+comment "ntfs-3g has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_NTFS_3G
+
 config BR2_PACKAGE_NTFS-3G
         bool "ntfs-3g"
 	select BR2_PACKAGE_PKGCONFIG

package/ntp/ntp-4.2.4_p5-adjtimex.patch

@@ -0,0 +1,33 @@
+https://support.ntp.org/bugs/show_bug.cgi?id=769
+http://bugs.gentoo.org/254030
+
+--- ntp/util/tickadj.c
++++ ntp/util/tickadj.c
+@@ -21,7 +21,8 @@
+ # include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
+ 
+-#ifdef HAVE___ADJTIMEX		/* Linux */
++/* proper handling here has been moved to upstream ntp bugzilla */
++#ifdef linux
+ 
+ #include <sys/timex.h>
+ struct timex txc;
+@@ -91,7 +92,7 @@
+ 	}
+ 
+ 	if (!errflg) {
+-		if (__adjtimex(&txc) < 0)
++		if (adjtimex(&txc) < 0)
+ 			perror("adjtimex");
+ 		else if (!quiet)
+ 			printf("tick     = %ld\ntick_adj = %d\n",
+@@ -146,7 +147,7 @@
+ #endif
+ 	}
+     
+-	if (__adjtimex(&txc) < 0)
++	if (adjtimex(&txc) < 0)
+ 	{
+ 		perror("adjtimex");
+ 	}

package/openntpd/Config.in

@@ -1,3 +1,6 @@
+comment "OpenNTPD has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_OPENNTPD
+
 config BR2_PACKAGE_OPENNTPD
 	bool "OpenNTPD"
 	help

package/openvpn/Config.in

@@ -1,3 +1,6 @@
+comment "openvpn has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_OPENVPN
+
 config BR2_PACKAGE_OPENVPN
 	bool "openvpn"
 	select BR2_PACKAGE_LZO

package/oprofile/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_OPROFILE
 	bool "oprofile"
 	select BR2_PACKAGE_POPT
-	select BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  OProfile is a system-wide profiler for Linux systems,
 	  capable of profiling all running code at low overhead.
@@ -17,3 +17,6 @@ config BR2_PACKAGE_OPROFILE
 	  profiling. All code is profiled: hardware and software
 	  interrupt handlers, kernel modules, the kernel, shared
 	  libraries, and applications.
+
+comment "oprofile requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP

package/pciutils/Config.in

@@ -1,3 +1,6 @@
+comment "pciutils has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_PCIUTILS
+
 config BR2_PACKAGE_PCIUTILS
 	bool "pciutils"
 	help

package/php/Config.ext

@@ -86,7 +86,7 @@ config BR2_PACKAGE_PHP_EXT_JSON
 
 config BR2_PACKAGE_PHP_EXT_READLINE
 	bool "readline"
-	depends on BR2_PACKAGE_PHP && (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_READLINE
+	depends on BR2_PACKAGE_PHP && (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_READLINE
 	help
 	  readline support
 

package/php/php.mk

@@ -87,7 +87,7 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
 	PHP_DEPS+=readline
 endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
-	PHP_CONFIGURE+=--with-ncurses=$(STATING_DIR)/usr
+	PHP_CONFIGURE+=--with-ncurses=$(STAGING_DIR)/usr
 	PHP_DEPS+=ncurses
 endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
@@ -132,6 +132,8 @@ php-source: $(DL_DIR)/$(PHP_SOURCE)
 
 $(PHP_DIR)/.unpacked: $(DL_DIR)/$(PHP_SOURCE)
 	$(PHP_CAT) $(DL_DIR)/$(PHP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(PHP_DIR) package/php/ php\*.patch
+	toolchain/patch-kernel.sh $(PHP_DIR) package/php/ php\*.patch.$(ARCH)
 	touch $@
 
 $(PHP_DIR)/.configured: $(PHP_DIR)/.unpacked
@@ -184,6 +186,8 @@ $(TARGET_DIR)/etc/php.ini: $(PHP_DIR)/.staged
 
 php: uclibc $(PHP_DEPS) $(PHP_TARGET_DEPS) $(TARGET_DIR)/etc/php.ini
 
+php-unpacked: $(PHP_DIR)/.unpacked
+
 php-clean:
 	rm -f $(PHP_DIR)/.configured $(PHP_DIR)/.built $(PHP_DIR)/.staged
 	rm -f $(PHP_TARGET_DEPS)

package/popt/popt.mk

@@ -5,9 +5,15 @@
 #############################################################
 POPT_VERSION:=1.14
 POPT_SITE:=http://rpm5.org/files/popt
-POPT_INSTALL_STAGING:=YES
-POPT_INSTALL_TARGET:=YES
-POPT_CONF_ENV:=ac_cv_va_copy=yes
+POPT_INSTALL_STAGING = YES
+POPT_INSTALL_TARGET = YES
+
+POPT_CONF_ENV = ac_cv_va_copy=yes
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+POPT_CONF_ENV += am_cv_lib_iconv=yes
+POPT_CONF_OPT += --with-libiconv-prefix=$(STAGING_DIR)/usr
+endif
 
 POPT_DEPENDENCIES:=uclibc
 

package/python/python.mk

@@ -17,7 +17,7 @@ PYTHON_SITE_PACKAGE_DIR=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site
 BR2_PYTHON_DISABLED_MODULES=dbm zipfile
 
 ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y)
-PYTHON_DEPS += readline-target
+PYTHON_DEPS += readline
 else
 BR2_PYTHON_DISABLED_MODULES += readline
 endif

package/qte/Config.in

@@ -1,8 +1,8 @@
 config BR2_PACKAGE_QTE
 	bool "Qt/E"
 	depends on BR2_DEPRECATED
-	select BR2_INSTALL_LIBSTDCPP
-	select BR2_PTHREADS_NATIVE
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PTHREADS_NATIVE
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBPNG
 	help
@@ -14,6 +14,11 @@ config BR2_PACKAGE_QTE
 	  Only tested with threading on, PACKAGE_JPEG, PACKAGE_LIBPNG,
 	  but remove those if you like.
 
+comment "Qt/E requires a toolchain with C++ support enabled and native threading enabled (NPTL)"
+	depends on !BR2_INSTALL_LIBSTDCPP
+	depends on BR2_DEPRECATED
+	depends on !BR2_PTHREADS_NATIVE
+
 config BR2_PACKAGE_QTE_COMMERCIAL_USERNAME
 	string "Qt/E Commercial License Username"
 	default ""

package/qtopia4/Config.in

@@ -1,12 +1,15 @@
 config BR2_PACKAGE_QTOPIA4
 	bool "qtopia4"
-	select BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PTHREADS_NATIVE
 	help
 	  Qtopia core 4.
 
 	  http://www.trolltech.com/
 
+comment "qtopia4 requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
 if BR2_PACKAGE_QTOPIA4
 
 config BR2_PACKAGE_QTOPIA4_DEBUG
@@ -86,12 +89,46 @@ config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
 	  library with proxy code and increase the space required on target.
 	  If unsure say n.
 
-config BR2_PACKAGE_QTOPIA4_DEPTHS
-	string "color depths to support"
-	default "-depths 24,16,8"
-	help
-	  Which color depths to support for the library. Default is "-depths
-	  24,16,8". Different depths are specified by a comma separated list.
+menu "Pixel depths"
+comment "Deselecting each option leads to Qt's default (8,16,32)"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL
+	bool "All supported depths"
+
+if !BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1
+	bool "1 bpp, black/white"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4
+	bool "4 bpp, grayscale"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8
+	bool "8 bpp, paletted"
+	default y
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12
+	bool "12 bpp, rgb 4-4-4"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15
+	bool "15 bpp, rgb 5-5-5"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16
+	bool "16 bpp, rgb 5-6-5"
+	default y
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18
+	bool "18 bpp, rgb 6-6-6"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24
+	bool "24 bpp, rgb 8-8-8"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32
+	bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8"
+	default y
+
+endif
+endmenu
 
 config BR2_PACKAGE_QTOPIA4_GIF
 	bool "Enable GIF support"

package/qtopia4/qtopia4.mk

@@ -66,6 +66,42 @@ QTOPIA4_CONFIGURE+= -no-qt3support
 endif
 
 
+### Pixel depths
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL),y)
+QTOPIA4_PIXEL_DEPTHS = all
+else
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1),y)
+QTOPIA4_PIXEL_DEPTHS += 1
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4),y)
+QTOPIA4_PIXEL_DEPTHS += 4
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8),y)
+QTOPIA4_PIXEL_DEPTHS += 8
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12),y)
+QTOPIA4_PIXEL_DEPTHS += 12
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15),y)
+QTOPIA4_PIXEL_DEPTHS += 15
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16),y)
+QTOPIA4_PIXEL_DEPTHS += 16
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18),y)
+QTOPIA4_PIXEL_DEPTHS += 18
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24),y)
+QTOPIA4_PIXEL_DEPTHS += 24
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32),y)
+QTOPIA4_PIXEL_DEPTHS += 32
+endif
+endif
+ifneq ($(QTOPIA4_PIXEL_DEPTHS),)
+QTOPIA4_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QTOPIA4_PIXEL_DEPTHS)))
+endif
+
 ### Display drivers
 ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_LINUXFB),y)
 QTOPIA4_CONFIGURE += -qt-gfx-linuxfb
@@ -310,8 +346,8 @@ ifneq ($(BR2_INET_IPV6),y)
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
 endif
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
-	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-        # Fix compiler path
+	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_QMAKE_CONF)
+	# Fix compiler path
 	$(SED) '\,QMAKE_CC[ 	]*=, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_QMAKE_CONF)
 	$(SED) '\,QMAKE_CXX[ 	]*=, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)
 	$(SED) '\,QMAKE_LINK[ 	]*=, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)

package/radvd/Config.in

@@ -0,0 +1,8 @@
+config BR2_PACKAGE_RADVD
+	bool "radvd"
+	select BR2_PACKAGE_FLEX
+	depends on BR2_INET_IPV6
+	help
+	  IPv6 Router Advertisement Daemon.
+
+	  http://www.litech.org/radvd/

package/radvd/S50radvd

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+RADVD=/usr/sbin/radvd
+
+echo "1" > /proc/sys/net/ipv6/conf/all/forwarding
+
+echo -n "Starting radvd: "
+if [ ! -x "${RADVD}" ]; then
+	echo "missing"
+	exit 1
+fi
+
+if ${RADVD} ; then
+	echo "done"
+else
+	echo "failed"
+	exit 1
+fi

package/radvd/radvd.mk

@@ -0,0 +1,20 @@
+#############################################################
+#
+# radvd
+#
+#############################################################
+RADVD_VERSION:=1.2
+RADVD_SOURCE:=radvd-$(RADVD_VERSION).tar.gz
+RADVD_SITE:=http://www.litech.org/radvd/dist/
+RADVD_AUTORECONF:=no
+RADVD_INSTALL_STAGING:=no
+RADVD_INSTALL_TARGET:=YES
+RADVD_DEPENDENCIES:=uclibc flex
+RADVD_MAKE:=$(MAKE1)
+RADVD_CONF_OPT:= --program-prefix=''
+
+$(eval $(call AUTOTARGETS,package,radvd))
+
+$(RADVD_HOOK_POST_INSTALL): $(RADVD_TARGET_INSTALL_TARGET)
+	$(INSTALL) -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d
+	touch $@

package/readline/Config.in

@@ -1,18 +1,5 @@
 #
-config BR2_READLINE
+config BR2_PACKAGE_READLINE
 	bool "readline"
 	help
 	    Enable GNU readline support?
-
-config BR2_PACKAGE_READLINE_TARGET
-	bool "readline for the target"
-	depends on BR2_READLINE
-	help
-	  Say yes here to install the readline libraries on the target.
-
-config BR2_PACKAGE_READLINE_HEADERS
-	bool "readline headers for the target"
-	depends on BR2_PACKAGE_READLINE_TARGET
-	help
-	  Say yes here to install the readline headers and documentation
-	  on the target.

package/readline/readline.mk

@@ -75,27 +75,17 @@ $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY): $(READLINE_DIR)/$(READLINE_BINAR
 		-C $(READLINE_DIR) install-shared uninstall-doc
 	chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
 	$(STRIPCMD) $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
-ifneq ($(BR2_PACKAGE_READLINE_HEADERS),y)
-	rm -rf $(TARGET_DIR)/usr/include/readline
-endif
 
-readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h
+readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
 
 readline-clean:
-	$(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall
+	-$(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall
+	-$(MAKE) -C $(READLINE_DIR) DESTDIR=$(TARGET_DIR) uninstall
 	-$(MAKE) -C $(READLINE_DIR) clean
 
 readline-dirclean:
 	rm -rf $(READLINE_DIR)
 
-readline-target: readline $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
-
-readline-target-clean:
-	-$(MAKE) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall
-
-ifeq ($(BR2_READLINE),y)
+ifeq ($(BR2_PACKAGE_READLINE),y)
 TARGETS+=readline
 endif
-ifeq ($(BR2_PACKAGE_READLINE_TARGET),y)
-TARGETS+=readline-target
-endif

package/ruby/Config.in

@@ -1,3 +1,6 @@
+comment "ruby has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_RUBY
+
 config BR2_PACKAGE_RUBY
 	bool "ruby"
 	help

package/smartmontools/Config.in

@@ -1,3 +1,6 @@
+comment "smartmontools has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_SMARTMONTOOLS
+
 config BR2_PACKAGE_SMARTMONTOOLS
 	bool "smartmontools"
 	help

package/strace/strace.mk

@@ -22,8 +22,8 @@ $(STRACE_HOOK_POST_INSTALL): $(STRACE_TARGET_INSTALL_TARGET)
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/strace
 	rm -f $(TARGET_DIR)/usr/bin/strace-graph
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
-	mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+	mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
 	install -c $(TARGET_DIR)/usr/bin/strace \
-		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/strace
+		$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/strace
 endif
 	touch $@

package/stunnel/Config.in

@@ -1,3 +1,6 @@
+comment "stunnel has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_STUNNEL
+
 config BR2_PACKAGE_STUNNEL
 	bool "stunnel"
 	help

package/stunnel/stunnel.mk

@@ -57,9 +57,9 @@ $(TARGET_DIR)/usr/bin/stunnel: $(STUNNEL_DIR)/src/stunnel
 	install -c $(STUNNEL_DIR)/src/stunnel $(TARGET_DIR)/usr/bin/stunnel
 	$(STRIPCMD) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
-	mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+	mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
 	install -c $(TARGET_DIR)/usr/bin/stunnel \
-		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel
+		$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel
 endif
 
 stunnel: uclibc $(TARGET_DIR)/usr/bin/stunnel

package/vtun/Config.in

@@ -1,3 +1,6 @@
+comment "vtun has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_VTUN
+
 config BR2_PACKAGE_VTUN
 	bool "vtun - BEWARE: read package/vtun/README.txt before use"
 	select BR2_PACKAGE_LZO

package/webkit/Config.in

@@ -1,18 +1,17 @@
 config BR2_PACKAGE_WEBKIT
 	bool "webkit"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	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
-
+comment "webkit requires a toolchain with C++ support and WCHAR enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR

package/webkit/webkit.mk

@@ -12,7 +12,7 @@ WEBKIT_INSTALL_TARGET = YES
 WEBKIT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
 
 WEBKIT_AUTORECONF = YES
-WEBKIT_DEPENDENCIES = icu curl libxml2 libxslt xserver_xorg-server libgtk2 sqlite
+WEBKIT_DEPENDENCIES = icu curl libxml2 libxslt libgtk2 sqlite
 WEBKIT_MAKE_OPT = GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal GLIB_MKENUMS=$(HOST_GLIB)/bin/glib-mkenums
 
 $(eval $(call AUTOTARGETS,package,webkit))

package/x11r7/Config.in

@@ -18,6 +18,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/libxcb/Config.in
 		source package/x11r7/mesa3d/Config.in
 		source package/x11r7/pthread-stubs/Config.in
+		source package/x11r7/xcb-util/Config.in
 		source package/x11r7/xlib_libFS/Config.in
 		source package/x11r7/xlib_libICE/Config.in
 		source package/x11r7/xlib_libSM/Config.in
@@ -126,6 +127,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xapp_xlsclients/Config.in
 		source package/x11r7/xapp_xlsfonts/Config.in
 		source package/x11r7/xapp_xmag/Config.in
+		source package/x11r7/xapp_xman/Config.in
 		source package/x11r7/xapp_xmessage/Config.in
 		source package/x11r7/xapp_xmh/Config.in
 		source package/x11r7/xapp_xmodmap/Config.in

package/x11r7/xapp_xman/Config.in

@@ -1,5 +1,4 @@
 config BR2_PACKAGE_XAPP_XMAN
-        bool "xapp_xman"
-        help
+	bool "xman"
+	help
 	  Manual page display program for the X Window System
-

package/x11r7/xcb-util/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XCB_UTIL
+	bool "xcb-util"
+	help
+	  Libraries which sit on top of libxcb, the core X protocol library,
+	  and some of the extension libraries.
+
+	  http://xcb.freedesktop.org/

package/xfsprogs/xfsprogs.mk

@@ -45,9 +45,7 @@ $(XFSPROGS_DIR)/.configured: $(XFSPROGS_DIR)/.unpacked
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
 		--exec-prefix=/ \
-		--libdir=/usr/lib \
 		$(XFSPROGS_CONFIG_SHARED) \
 	)
 	touch $(XFSPROGS_DIR)/.configured
@@ -75,7 +73,6 @@ endif
 $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY): $(XFSPROGS_DIR)/$(XFSPROGS_BINARY)
 	$(MAKE1) PATH=$(TARGET_PATH) \
 	    DIST_ROOT=$(TARGET_DIR) \
-	    prefix=/usr \
 	    exec-prefix=/ \
 	    -C $(XFSPROGS_DIR) install
 	rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc

package/xpdf/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_XPDF
 	bool "xpdf"
 	select BR2_PACKAGE_OPENMOTIF
+	select BR2_PACKAGE_FREETYPE
 	help
 	  Xpdf is an open source viewer for Portable Document Format
 	  (PDF) files.

scripts/buildall.sh

@@ -1,5 +1,17 @@
 #!/bin/sh
+# Should be copied to toplevel before it is run.
+# An OK sttus indicates that it compiles for an arch.
+# This has been tested on ARM and AVR32, status is for ARM
+sed	-i s/^.*Config.in.test.*//	Config.in
+echo	"source \"scripts/test/Config.in.test.$1\"" >> Config.in
+sed	-i s/^.*BR2_TARGET_TEST_PACKAGES*//	.config
+echo	"BR2_TARGET_TEST_PACKAGES=y" >> .config
+#cat	scripts/test/noconfiguration.$1 >> .config
+make 	oldconfig	> info.log 2>&1
+
 source	"scripts/testheader.inc"
+make	flush
+
 
 skip	mk	busybox
 bb	mk	bash
@@ -11,6 +23,7 @@ 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	
@@ -25,48 +38,49 @@ 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	popt                           OK
 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	oprofile                       FAIL	"error: bfd library not found"
 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"
+AVR	mk	berkeleydb                     OK	"Machine avr32 not recognized"
 EXE	mk	bsdiff                         OK	
-bb	mk	bootutils			?
+bb	mk	bootutils
 EXE	mk	cups                           OK	
 EXE	mk	customize                      OK	
-bb	mk	dash				?
+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"
+EXE	mk	icu                            OK	"No rule to create out"
+AVR	mk	kexec                          OK	"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	  
+skip	mk	libfloat                       DISABLED	"Obsolete package"
 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	logrotate                      OK
 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	module-init-tools	       OK	"Use this instead of modutils"
+skip	mk	modutils		       FAIL	"This package is for the Linus 2.4 kernel"
 EXE	mk	ng-spice-rework                FAIL	"Environment change"
 bb	mk	procps
 bb	mk	psmisc
@@ -74,13 +88,23 @@ EXE	mk	screen                         OK
 EXE	mk	strace                         OK	
 EXE	mk	sudo                           OK	
 bb	mk	sysklogd
-eomment "busybox has init and the runit stuff"
+
+comment "busybox has init and the runit stuff"
 bb	mk	sysvinit
 bb	mk	tinylogin
 bb	mk	util-linux
 bb	mk	which
+
 comment "database"
+EXE	mk	mysql_client
+EXE	mk	sqlite
+
 comment "editors"
+EXE	mk	ed
+EXE	mk	nano
+EXE	mk	uemacs
+EXE	mk	vim
+
 comment "Networking applications"
 AVR	mk	argus                          FAIL	"Machine avr32 not recognized"
 EXE	mk	avahi                          OK	
@@ -105,19 +129,19 @@ EXE	mk	l2tp                           OK
 EXE	mk	libcgi                         OK	
 EXE	mk	libcgicc                       OK	
 EXE	mk	libosip2		       FAIL
-AVR	mk	libeXosip2                     FAIL	"Machine avr32 not recognized"
+AVR	mk	libeXosip2                     OK	"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"
+EXE	mk	mdnsresponder                  OK	"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	ncftp                          OK	"Depends on ncurses"
 EXE	mk	neon                           OK	
 bb	mk	netcat
 EXE	mk	netkitbase                     OK	
@@ -156,7 +180,8 @@ EXE	mk	vsftpd                         OK
 AVR	mk	vtun                           FAIL	"Machine avr32 not recognized"
 EXE	mk	webif                          OK	
 bb	mk	wget
-EXE	mk	wireless-tools                 OK	
+EXE	mk	wireless-tools                 OK
+	
 comment "Hardware handling / blockdevices and filesystem maintenance"
 EXE	mk	acpid                          OK	
 EXE	mk	dbus                           OK	
@@ -196,6 +221,7 @@ 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"
@@ -203,8 +229,10 @@ 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"
@@ -227,11 +255,14 @@ 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	
@@ -251,15 +282,18 @@ 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
+RESTART
 EXE	mk	atk
 EXE	mk	cairo
 EXE	mk	pango
@@ -278,12 +312,15 @@ EXE	mk	openmotif
 EXE	mk	fontconfig
 EXE	mk	freetype
 EXE	mk	tslib
+SKIP
 EXE	mk	webkit
-skip	startup-notification		"Depends on X11"
+skip	mk	startup-notification	       DISABLED	"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
@@ -310,9 +347,11 @@ 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	  
+EXE	mk	portage                        OK 
+
 comment "XML handling"
 EXE	mk	expat                          OK	
 EXE	mk	ezxml                          OK	

scripts/mkpkg

@@ -38,36 +38,72 @@ function	process ()
 	grep "\.tar\." ${LOG} > ${DEPENDENCY}
 	if [ ${test} == ${OK} ] ; then
 		mv ${LOG} ${LOG_OK_FILE}
-		echo "OK	"
+		printf "%-16s" "OK"
+		if [ "${2}X" != "X" ] ; then
+			printf	"%-16s"	"\"$2\"";
+		fi
+		if [ "${3}X" != "X" ] ; then
+			printf	"%s"	"\"$3\"";
+		fi
+		echo
 	else
 		mv ${LOG} ${LOG_FAIL_FILE}
-		printf "FAIL	"
-		echo	\"$2\"
+		printf "%-16s" "FAIL"
+		if [ "${2}X" != "X" ] ; then
+			printf	"%-16s"	"\"$2\"";
+		else
+			printf	"%-16s"	"\"\""
+		fi
+		if [ "${3}X" != "X" ] ; then
+			printf	"%s"	"\"$3\"";
+		fi
+		echo
 	fi
 }
 
 function build_package ()
 {
-	printf "mk	%-31s" "$1"
+	# echo "BUILD PACKAGE:1=$1 2=$2 3=$3 4=$4 5=$5 6=$6 7=$7"
+	printf "mk	%-32s" "$1"
 	if [ "$2X" == "X" ] ; then		# no parameters
 		clean_files	$1
 		dirclean	$1
-		process		$1
+		process		$1 "$3"
+	elif [ "$2X" == "?X" ] ; then		# no parameters
+		clean_files	$1
+		dirclean	$1
+		process		$1 "$3"
 	elif [ "$2X" == "OKX" ] ; then	# Previous build was OK
 		clean_files	$1
 		dirclean	$1
-		process		$1
+		process		$1 "$3"
 	elif [ "$2X" == "FAILX" ] ; then
 		clean_files	$1
 		dirclean	$1
-		process		$1 $3
+		process		$1 "$3"
 	elif [ "$2X" == "BROKENX" ] ; then
-		printf  "BROKEN	"
-		echo	\"$3\"
+		printf  "%-16s" "BROKEN"
+		if [ "${3}X" != "X" ] ; then
+			printf	"%s"	"\"$3\"";
+		fi
+		echo
+	elif [ "$2X" == "DISABLEDX" ] ; then
+		printf  "%-16s" "DISABLED"
+		if [ "${3}X" != "X" ] ; then
+			printf	"%s"	"\"$3\"";
+		fi
+		echo
+	else
+		printf  "%-16s" "?BROKEN"
+		if [ "${3}X" != "X" ] ; then
+			printf	"%s"	"\"$3\"";
+		fi
+		echo
 	fi
 }
 
-build_package $1 $2 $3
+#build_package $1 $2 "\"$3\""
+build_package $1 $2 "$3"
 
 
 

scripts/test/Config.in.test.buildall

@@ -0,0 +1,717 @@
+
+
+config BR2_TARGET_TEST_PACKAGES
+	bool "Enable most packages for testing purposes"
+	help
+	  Enables most packages.
+	  X-Windows and Qtopia are significant exceptions
+
+#	select BR2_LARGEFILE
+#	select BR2_INET_IPV6
+#	select BR2_INET_RPC
+#	select BR2_USE_WCHAR
+
+	select BR2_PACKAGE_BUSYBOX
+	select BR2_BUSYBOX_VERSION_1_13_X
+	select BR2_PACKAGE_BUSYBOX_FULLINSTALL
+	select BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+	select BR2_PACKAGE_BZIP2
+	select BR2_PACKAGE_FLEX
+		select BR2_PACKAGE_FLEX_LIBFL
+	select BR2_PACKAGE_GCC_TARGET
+	select BR2_PACKAGE_MAKE
+	select BR2_PACKAGE_AUTOCONF
+	select BR2_PACKAGE_AUTOMAKE
+	select BR2_PACKAGE_BISON
+	select BR2_PACKAGE_CCACHE_TARGET
+	select BR2_PACKAGE_CVS
+	select BR2_PACKAGE_CVS_SERVER
+	select BR2_PACKAGE_DISTCC
+	select BR2_PACKAGE_DMALLOC
+	select BR2_PACKAGE_FAKEROOT
+	select BR2_HOST_FAKEROOT
+	select BR2_PACKAGE_GETTEXT
+	select BR2_PACKAGE_GETTEXT_STATIC
+	select BR2_PACKAGE_LIBINTL
+	select BR2_PACKAGE_LIBGMP
+		select BR2_PACKAGE_LIBGMP_HEADERS
+
+	select BR2_PACKAGE_GPERF
+	select BR2_PACKAGE_LIBMPFR
+		select BR2_PACKAGE_LIBMPFR_HEADERS
+
+	select BR2_PACKAGE_LIBTOOL
+	select BR2_PACKAGE_M4
+	select BR2_PACKAGE_MPATROL
+	select BR2_PACKAGE_OPROFILE
+	select BR2_PACKAGE_PKGCONFIG
+	select BR2_PACKAGE_READLINE
+		select BR2_PACKAGE_READLINE_TARGET
+		select BR2_PACKAGE_READLINE_HEADERS
+
+	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_AT
+	select BR2_PACKAGE_BEECRYPT
+	select BR2_PACKAGE_BERKELEYDB
+	select BR2_PACKAGE_BSDIFF
+	select BR2_PACKAGE_CUPS
+	select BR2_PACKAGE_CUSTOMIZE
+	select BR2_PACKAGE_FILE
+	select BR2_PACKAGE_GAMIN
+	select BR2_PACKAGE_ICU
+	select BR2_PACKAGE_KEXEC
+		select BR2_PACKAGE_KEXEC_ZLIB
+
+	select BR2_PACKAGE_LIBCONFIG
+	select BR2_PACKAGE_LIBCONFUSE
+	select BR2_PACKAGE_LIBDAEMON
+	select BR2_PACKAGE_LIBELF
+		select BR2_PACKAGE_LIBELF_HEADERS
+
+	select BR2_PACKAGE_LIBEVENT
+	select BR2_PACKAGE_LIBGCRYPT
+	select BR2_PACKAGE_LIBGPG_ERROR
+	select BR2_PACKAGE_LIBICONV
+	select BR2_PACKAGE_LIBIDN
+	select BR2_PACKAGE_LIBLOCKFILE
+	select BR2_PACKAGE_LIBOIL
+	select BR2_PACKAGE_LIBSYSFS
+	select BR2_PACKAGE_LOCKFILE_PROGS
+	select BR2_PACKAGE_LOGROTATE
+	select BR2_PACKAGE_LSOF
+	select BR2_PACKAGE_LTP-TESTSUITE
+	select BR2_PACKAGE_LTRACE
+# BR2_PACKAGE_LTT is not set
+	select BR2_PACKAGE_MEMSTAT
+	select BR2_PACKAGE_NG_SPICE_REWORK
+	select BR2_PACKAGE_POPT
+	select BR2_PACKAGE_SCREEN
+	select BR2_PACKAGE_STARTUP_NOTIFICATION
+	select BR2_PACKAGE_STRACE
+	select BR2_PACKAGE_SUDO
+	select BR2_PACKAGE_MYSQL_CLIENT
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_ARGUS
+	select BR2_PACKAGE_AVAHI
+		select BR2_PACKAGE_AVAHI_AUTOIPD
+		select BR2_PACKAGE_AVAHI_DAEMON
+
+	select BR2_PACKAGE_AXEL
+	select BR2_PACKAGE_BIND
+	select BR2_PACKAGE_BRIDGE
+	select BR2_PACKAGE_DNSMASQ
+		select BR2_PACKAGE_DNSMASQ_TFTP
+
+	select BR2_PACKAGE_DROPBEAR
+	select BR2_PACKAGE_ETHTOOL
+	select BR2_PACKAGE_HASERL
+# 		BR2_PACKAGE_HASERL_VERSION_0_8_X is not set
+		select BR2_PACKAGE_HASERL_VERSION_0_9_X
+
+	select BR2_PACKAGE_IFPLUGD
+	select BR2_PACKAGE_IPERF
+	select BR2_PACKAGE_IPROUTE2
+	select BR2_PACKAGE_IPSEC_TOOLS
+		select BR2_PACKAGE_IPSEC_TOOLS_STATS
+		select BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT
+		select BR2_PACKAGE_IPSEC_TOOLS_NATT
+		select BR2_PACKAGE_IPSEC_TOOLS_FRAG
+		select BR2_PACKAGE_IPSEC_TOOLS_READLINE
+# BR2_PACKAGE_IPSEC_TOOLS_IPV6 is not set
+# BR2_PACKAGE_IPSEC_TOOLS_LIBS is not set
+
+	select BR2_PACKAGE_IPTABLES
+	select BR2_PACKAGE_KISMET
+	select BR2_PACKAGE_L2TP
+	select BR2_PACKAGE_LIBCGI
+	select BR2_PACKAGE_LIBCGICC
+	select BR2_PACKAGE_LIBCURL
+		select BR2_PACKAGE_CURL
+
+	select BR2_PACKAGE_LIBDNET
+		select BR2_PACKAGE_LIBDNET_PYTHON
+
+	select BR2_PACKAGE_LIBOSIP2
+	select BR2_PACKAGE_LIBEXOSIP2
+	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBUPNP
+	select BR2_PACKAGE_LINKS
+	select BR2_PACKAGE_LRZSZ
+	select BR2_PACKAGE_MDNSRESPONDER
+		select BR2_PACKAGE_MDNSRESPONDER_UTILS
+
+	select BR2_PACKAGE_MICROCOM
+	select BR2_PACKAGE_MIIDIAG
+	select BR2_PACKAGE_MROUTED
+	select BR2_PACKAGE_MUTT
+	select BR2_PACKAGE_NBD
+	select BR2_PACKAGE_NCFTP
+		select BR2_PACKAGE_NCFTP_GET
+		select BR2_PACKAGE_NCFTP_PUT
+		select BR2_PACKAGE_NCFTP_LS
+		select BR2_PACKAGE_NCFTP_BATCH
+		select BR2_PACKAGE_NCFTP_SPOOLER
+		select BR2_PACKAGE_NCFTP_BOOKMARKS
+
+	select BR2_PACKAGE_NEON
+		select BR2_PACKAGE_NEON_ZLIB
+# BR2_PACKAGE_NEON_EXPAT is not set
+		select BR2_PACKAGE_NEON_LIBXML2
+# BR2_PACKAGE_NEON_NOXML is not set
+
+	select BR2_PACKAGE_NETKITBASE
+	select BR2_PACKAGE_NETKITTELNET
+	select BR2_PACKAGE_NETPLUG
+	select BR2_PACKAGE_NETSNMP
+	select BR2_PACKAGE_NFS_UTILS
+		select BR2_PACKAGE_NFS_UTILS_RPCDEBUG
+		select BR2_PACKAGE_NFS_UTILS_RPC_LOCKD
+		select BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD
+
+	select BR2_PACKAGE_NTP
+		select BR2_PACKAGE_NTP_SNTP
+
+	select BR2_PACKAGE_OLSR
+	select BR2_PACKAGE_OPENNTPD
+	select BR2_PACKAGE_OPENSSH
+	select BR2_PACKAGE_OPENSSL
+		select BR2_PACKAGE_OPENSSL_BIN
+		select BR2_PACKAGE_OPENSSL_ENGINES
+
+	select BR2_PACKAGE_OPENVPN
+	select BR2_PACKAGE_OPENSWAN
+# 		BR2_PACKAGE_OPENSWAN_DEBUGGING is not set
+
+	select BR2_PACKAGE_PORTMAP
+	select BR2_PACKAGE_PPPD
+	select BR2_PACKAGE_RP_PPPOE
+	select BR2_PACKAGE_PPTP_LINUX
+	select BR2_PACKAGE_PROFTPD
+
+#
+# quagga suite
+#
+	select BR2_PACKAGE_QUAGGA_ZEBRA
+	select BR2_PACKAGE_QUAGGA_BGPD
+	select BR2_PACKAGE_QUAGGA_RIPD
+	select BR2_PACKAGE_QUAGGA_RIPNGD
+	select BR2_PACKAGE_QUAGGA_OSPFD
+	select BR2_PACKAGE_QUAGGA_OSPF6D
+	select BR2_PACKAGE_QUAGGA_WATCHQUAGGA
+	select BR2_PACKAGE_QUAGGA_ISISD
+	select BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE
+	select BR2_PACKAGE_QUAGGA_NETLINK
+	select BR2_PACKAGE_QUAGGA_SNMP
+	select BR2_PACKAGE_QUAGGA_TCP_ZEBRA
+	select BR2_PACKAGE_QUAGGA_OPAGUE_LSA
+	select BR2_PACKAGE_QUAGGA_CONFIGURE
+
+	select BR2_PACKAGE_RSYNC
+
+	select BR2_PACKAGE_SAMBA
+		select BR2_PACKAGE_SAMBA_CIFS
+		select BR2_PACKAGE_SAMBA_EVENTLOGADM
+		select BR2_PACKAGE_SAMBA_FINDSMB
+		select BR2_PACKAGE_SAMBA_NET
+		select BR2_PACKAGE_SAMBA_NMBD
+		select BR2_PACKAGE_SAMBA_NMBLOOKUP
+		select BR2_PACKAGE_SAMBA_NTLM_AUTH
+		select BR2_PACKAGE_SAMBA_PDBEDIT
+		select BR2_PACKAGE_SAMBA_PROFILES
+		select BR2_PACKAGE_SAMBA_RPCCLIENT
+		select BR2_PACKAGE_SAMBA_SMBCACLS
+		select BR2_PACKAGE_SAMBA_SMBCLIENT
+		select BR2_PACKAGE_SAMBA_SMBCONTROL
+		select BR2_PACKAGE_SAMBA_SMBCQUOTAS
+		select BR2_PACKAGE_SAMBA_SMBGET
+		select BR2_PACKAGE_SAMBA_SMBPASSWD
+		select BR2_PACKAGE_SAMBA_SMBSPOOL
+		select BR2_PACKAGE_SAMBA_SMBSTATUS
+		select BR2_PACKAGE_SAMBA_SMBTREE
+		select BR2_PACKAGE_SAMBA_SWAT
+		select BR2_PACKAGE_SAMBA_SMBTAR
+		select BR2_PACKAGE_SAMBA_TDB
+		select BR2_PACKAGE_SAMBA_TESTPARM
+		select BR2_PACKAGE_SAMBA_WINBINDD
+		select BR2_PACKAGE_SAMBA_WBINFO
+
+
+
+	select BR2_PACKAGE_SOCAT
+	select BR2_PACKAGE_STUNNEL
+	select BR2_PACKAGE_TCPDUMP
+		select BR2_PACKAGE_TCPDUMP_SMB
+
+	select BR2_PACKAGE_DHCPDUMP
+	select BR2_PACKAGE_TFTPD
+# BR2_PACKAGE_TN5250 is not set
+	select BR2_PACKAGE_TTCP
+	select BR2_PACKAGE_UDPCAST
+		select BR2_PACKAGE_UDPCAST_SENDER
+		select BR2_PACKAGE_UDPCAST_RECEIVER
+
+	select BR2_PACKAGE_VPNC
+	select BR2_PACKAGE_VSFTPD
+	select BR2_PACKAGE_VTUN
+	select BR2_PACKAGE_WEBIF
+		select BR2_PACKAGE_WEBIF_INSTALL_INDEX_HTML
+		select BR2_PACKAGE_WEBIF_LANGUAGES
+
+	select BR2_PACKAGE_WIRELESS_TOOLS
+
+#
+# Hardware handling / blockdevices and filesystem maintenance
+#
+	select BR2_PACKAGE_DBUS
+	select BR2_DBUS_EXPAT
+		select BR2_DBUS_LIBXML2
+		select BR2_PACKAGE_DBUS_GLIB
+
+	select BR2_PACKAGE_DEVMEM2
+	select BR2_PACKAGE_DM
+	select BR2_PACKAGE_DMRAID
+	select BR2_PACKAGE_E2FSPROGS
+		select BR2_PACKAGE_E2FSPROGS_BADBLOCKS
+		select BR2_PACKAGE_E2FSPROGS_BLKID
+		select BR2_PACKAGE_E2FSPROGS_CHATTR
+		select BR2_PACKAGE_E2FSPROGS_DUMPE2FS
+		select BR2_PACKAGE_E2FSPROGS_E2FSCK
+		select BR2_PACKAGE_E2FSPROGS_E2LABEL
+		select BR2_PACKAGE_E2FSPROGS_FILEFRAG
+		select BR2_PACKAGE_E2FSPROGS_FINDFS
+		select BR2_PACKAGE_E2FSPROGS_FSCK
+		select BR2_PACKAGE_E2FSPROGS_LOGSAVE
+		select BR2_PACKAGE_E2FSPROGS_LSATTR
+		select BR2_PACKAGE_E2FSPROGS_MKE2FS
+		select BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND
+		select BR2_PACKAGE_E2FSPROGS_TUNE2FS
+		select BR2_PACKAGE_E2FSPROGS_UUIDGEN
+		select BR2_PACKAGE_EEPROG
+
+	select BR2_PACKAGE_FCONFIG
+	select BR2_PACKAGE_FIS
+	select BR2_PACKAGE_LIBFUSE
+	select BR2_PACKAGE_GADGETFS_TEST
+#		BR2_PACKAGE_GADGETFS_TEST_USE_AIO is not set
+
+	select BR2_PACKAGE_HAL
+	select BR2_PACKAGE_HWDATA
+	select BR2_PACKAGE_I2C_TOOLS
+	select BR2_PACKAGE_INPUT_TOOLS
+		select BR2_PACKAGE_INPUT_TOOLS_EVTEST
+		select BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH
+		select BR2_PACKAGE_INPUT_TOOLS_JSCAL
+		select BR2_PACKAGE_INPUT_TOOLS_JSTEST
+
+	select BR2_PACKAGE_IOSTAT
+	select BR2_PACKAGE_LIBAIO
+# BR2_PACKAGE_LIBRAW1394 is not set
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_LM_SENSORS
+	select BR2_PACKAGE_LVM2
+	select BR2_PACKAGE_MDADM
+	select BR2_PACKAGE_MEMTESTER
+	select BR2_PACKAGE_MKDOSFS
+	select BR2_PACKAGE_MTD
+# BR2_PACKAGE_MTD_UTILS is not set
+		select BR2_PACKAGE_MTD_20061007
+# 		BR2_PACKAGE_MTD_20050122 is not set
+# 		BR2_PACKAGE_MTD_UTILS_GIT is not set
+
+#
+# MTD tools selection
+#
+		select BR2_PACKAGE_MTD_DOCFDISK
+		select BR2_PACKAGE_MTD_DOC_LOADBIOS
+		select BR2_PACKAGE_MTD_FLASHCP
+		select BR2_PACKAGE_MTD_FLASH_ERASE
+		select BR2_PACKAGE_MTD_FLASH_ERASEALL
+		select BR2_PACKAGE_MTD_FLASH_INFO
+		select BR2_PACKAGE_MTD_FLASH_LOCK
+		select BR2_PACKAGE_MTD_FLASH_UNLOCK
+		select BR2_PACKAGE_MTD_FTL_CHECK
+		select BR2_PACKAGE_MTD_FTL_FORMAT
+		select BR2_PACKAGE_MTD_JFFS2DUMP
+		select BR2_PACKAGE_MTD_MKFSJFFS2
+		select BR2_PACKAGE_MTD_MKFSJFFS
+		select BR2_PACKAGE_MTD_MTD_DEBUG
+		select BR2_PACKAGE_MTD_NANDDUMP
+		select BR2_PACKAGE_MTD_NANDWRITE
+		select BR2_PACKAGE_MTD_NFTL_FORMAT
+		select BR2_PACKAGE_MTD_NFTLDUMP
+		select BR2_PACKAGE_MTD_SUMTOOL
+		select BR2_PACKAGE_NTFS-3G
+# BR2_PACKAGE_PCIUTILS is not set
+# BR2_PACKAGE_PCMCIA is not set
+# BR2_PACKAGE_RAIDTOOLS is not set
+	select BR2_PACKAGE_SETSERIAL
+	select BR2_PACKAGE_SMARTMONTOOLS
+	select BR2_PACKAGE_UDEV_VOLUME_ID
+	select BR2_PACKAGE_UDEV_SCSI_ID
+	select BR2_PACKAGE_USBMOUNT
+	select BR2_PACKAGE_USBUTILS
+	select BR2_PACKAGE_WIPE
+# BR2_PACKAGE_XFSPROGS is not set
+
+#
+# Audio and video libraries and applications
+#
+	select BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_ALSA_LIB_PYTHON
+	select BR2_PACKAGE_ALSA_UTILS
+
+#
+# ALSA utils selection
+#
+	select BR2_PACKAGE_ALSA_UTILS_ALSACONF
+	select BR2_PACKAGE_ALSA_UTILS_ALSACTL
+	select BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
+# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
+	select BR2_PACKAGE_ALSA_UTILS_AMIXER
+	select BR2_PACKAGE_ALSA_UTILS_APLAY
+# BR2_PACKAGE_ALSA_UTILS_ARECORD is not set
+# BR2_PACKAGE_ALSA_UTILS_IECSET is not set
+# BR2_PACKAGE_ALSA_UTILS_ACONNECT is not set
+# BR2_PACKAGE_ALSA_UTILS_APLAYMIDI is not set
+# BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI is not set
+# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
+# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
+# BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST is not set
+# BR2_PACKAGE_ASTERISK is not set
+	select BR2_PACKAGE_AUMIX
+	select BR2_PACKAGE_GSTREAMER
+	select BR2_PACKAGE_GST_PLUGINS_BASE
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER is not set
+	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOCONVERT
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORATE is not set
+	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC is not set
+	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP is not set
+	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_SUBPARSE is not set
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TCP is not set
+	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC is not set
+# BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEORATE is not set
+	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOSCALE
+	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME
+# 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
+	select BR2_PACKAGE_GST_PLUGINS_GOOD
+# 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
+	select BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AVI
+# 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
+	select BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE
+	select BR2_PACKAGE_GST_PLUGINS_UGLY
+# BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ASFDEMUX is not set
+# BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC is not set
+# BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDSUB is not set
+# BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_IEC958 is not set
+# BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGAUDIOPARSE is not set
+# BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGSTREAM is not set
+# BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_REALMEDIA is not set
+# BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA is not set
+# BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ID3TAG is not set
+# BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD is not set
+	select BR2_PACKAGE_LIBID3TAG
+	select BR2_PACKAGE_LIBMAD
+	select BR2_PACKAGE_LIBMAD_TARGET_HEADERS
+	select BR2_PACKAGE_LIBMPD
+	select BR2_PACKAGE_LIBOGG
+	select BR2_PACKAGE_LIBSNDFILE
+	select BR2_PACKAGE_LIBTHEORA
+	select BR2_PACKAGE_LIBVORBIS
+	select BR2_PACKAGE_LIBVORBIS_TREMOR
+	select BR2_PACKAGE_MADPLAY
+	select BR2_PACKAGE_MADPLAY_ALSA
+	select BR2_PACKAGE_MPG123
+	select BR2_PACKAGE_MPG123_ALSA
+	select BR2_PACKAGE_MPLAYER
+	select BR2_PACKAGE_SPEEX
+		select BR2_PACKAGE_SPEEX_ARM_GENERIC
+	select BR2_PACKAGE_FESTIVAL
+	select BR2_PACKAGE_SPEECH_TOOLS
+		select BR2_PACKAGE_FESTLEX_CMU
+		select BR2_PACKAGE_FESTLEX_OALD
+		select BR2_PACKAGE_FESTLEX_POS
+	select BR2_PACKAGE_FESTVOX_AWB
+	select BR2_PACKAGE_FESTVOX_BDL
+	select BR2_PACKAGE_FESTVOX_JMK
+	select BR2_PACKAGE_FESTVOX_SLT
+# BR2_PACKAGE_FESTVOX_AWB_MULTISYN is not set
+# BR2_PACKAGE_FESTVOX_JMK_MULTISYN is not set
+# BR2_PACKAGE_FESTVOX_KAL_SIXTEENK is not set
+# BR2_PACKAGE_FESTVOX_KED_EIGHTK is not set
+# BR2_PACKAGE_FESTVOX_KED_SIXTEENK is not set
+	select BR2_PACKAGE_VLC
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_NCURSES_TARGET_PANEL
+	select BR2_PACKAGE_NCURSES_TARGET_FORM
+	select BR2_PACKAGE_NCURSES_TARGET_MENU
+	select BR2_PACKAGE_NCURSES_TARGET_HEADERS
+	select BR2_PACKAGE_NEWT
+	select BR2_PACKAGE_SLANG
+	select BR2_PACKAGE_DIALOG
+	select BR2_PACKAGE_DIRECTFB
+	select BR2_PACKAGE_DIRECTFB_MULTI
+	select BR2_PACKAGE_DIRECTFB_KEYBOARD
+	select BR2_PACKAGE_DIRECTFB_SERIALMOUSE
+	select BR2_PACKAGE_DIRECTFB_PNG
+	select BR2_PACKAGE_DIRECTFB_TSLIB
+	select BR2_PACKAGE_DIRECTFB_GIF
+	select BR2_PACKAGE_DIRECTFB_JPEG
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_BLTLOAD
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_CPULOAD
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_DATABUFFER
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_DIOLOAD
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_DOK
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_DRIVERTEST
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_FIRE
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_FLIP
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_FONTS
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_INPUT
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_JOYSTICK
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_KNUCKLES
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_LAYER
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_NEO
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_NETLOAD
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_PALETTE
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_PARTICLE
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_PORTER
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_STRESS
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_TEXTURE
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_VIDEO_PARTICLE
+	select BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW
+	select BR2_PACKAGE_FBDUMP
+	select BR2_PACKAGE_IMAGEMAGICK
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_LIBART
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_LIBUNGIF
+	select BR2_PACKAGE_LINUX_FUSION
+	select BR2_PACKAGE_LITE
+	select BR2_PACKAGE_PIXMAN
+	select BR2_PACKAGE_SAWMAN
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_FBCON
+	select BR2_PACKAGE_SDL_DIRECTFB
+# BR2_PACKAGE_SDL_QTOPIA is not set
+# BR2_PACKAGE_SDL_X11 is not set
+	select BR2_PACKAGE_SDL_IMAGE
+	select BR2_PACKAGE_SDL_IMAGE_BMP
+	select BR2_PACKAGE_SDL_IMAGE_GIF
+	select BR2_PACKAGE_SDL_IMAGE_JPEG
+# BR2_PACKAGE_SDL_IMAGE_LBM is not set
+# BR2_PACKAGE_SDL_IMAGE_PCX is not set
+# BR2_PACKAGE_SDL_IMAGE_PNG is not set
+# BR2_PACKAGE_SDL_IMAGE_PNM is not set
+# BR2_PACKAGE_SDL_IMAGE_TARGA is not set
+# BR2_PACKAGE_SDL_IMAGE_TIFF is not set
+# BR2_PACKAGE_SDL_IMAGE_XCF is not set
+# BR2_PACKAGE_SDL_IMAGE_XPM is not set
+# BR2_PACKAGE_SDL_IMAGE_XV is not set
+	select BR2_PACKAGE_SDL_MIXER
+	select BR2_PACKAGE_SDL_NET
+	select BR2_PACKAGE_SDL_TTF
+	select BR2_PACKAGE_TIFF
+	select BR2_PACKAGE_FBV
+	select BR2_PACKAGE_FBSET
+# BR2_PACKAGE_QTOPIA4 is not set
+	select BR2_PACKAGE_XSERVER_none
+# BR2_PACKAGE_XSERVER_xorg is not set
+# BR2_PACKAGE_XSERVER_tinyx is not set
+	select BR2_PACKAGE_ATK
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_PANGO
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_LIBERATION
+	select BR2_PACKAGE_LIBGLADE
+	select BR2_PACKAGE_LIBGLIB12
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBGTK2
+	select BR2_PACKAGE_LIBGTK2_ENGINES
+	select BR2_PACKAGE_GTK2_THEME_HICOLOR
+	select BR2_PACKAGE_LIBSEXY
+# BR2_PACKAGE_OPENMOTIF is not set
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_FREETYPE
+# BR2_FREETYPE_VERSION_2_2_1 is not set
+	select BR2_FREETYPE_VERSION_2_3_7
+	select BR2_PACKAGE_TSLIB
+	select BR2_PACKAGE_WEBKIT
+# BR2_PACKAGE_MATCHBOX is not set
+# BR2_PACKAGE_ALSAMIXERGUI is not set
+
+#
+# dillo		- disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))
+#
+# BR2_PACKAGE_GQVIEW is not set
+# BR2_PACKAGE_GMPC is not set
+# BR2_PACKAGE_GTKPERF is not set
+# BR2_PACKAGE_LEAFPAD is not set
+
+#
+# midori		- disabled (requires Xorg(7))
+#
+# BR2_PACKAGE_PCMANFM is not set
+# BR2_PACKAGE_SYLPHEED is not set
+# BR2_PACKAGE_TORSMO is not set
+# BR2_PACKAGE_X11VNC is not set
+# BR2_PACKAGE_XPDF is not set
+# BR2_PACKAGE_XSTROKE is not set
+# BR2_PACKAGE_XVKBD is not set
+
+#
+# Compressors / decompressors
+#
+	select BR2_PACKAGE_LZO
+# BR2_PACKAGE_LZMA_TARGET is not set
+	select BR2_PACKAGE_LZMA_HOST
+	select BR2_PACKAGE_ZLIB
+# BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
+
+#
+# Package managers
+#
+	select BR2_PACKAGE_IPKG
+	select BR2_PACKAGE_PORTAGE
+
+#
+# Interpreter languages / Scripting
+#
+	select BR2_PACKAGE_LUA
+	select BR2_PACKAGE_MICROPERL
+	select BR2_PACKAGE_PYTHON
+# BR2_PACKAGE_PYTHON_DEV is not set
+	select BR2_PACKAGE_PYTHON_PY_ONLY
+# BR2_PACKAGE_PYTHON_PYC_ONLY is not set
+# BR2_PACKAGE_PYTHON_PY_PYC is not set
+
+#
+# The following modules are unusual or require extra libraries
+#
+# BR2_PACKAGE_PYTHON_BSDDB is not set
+# BR2_PACKAGE_PYTHON_CODECSCJK is not set
+# BR2_PACKAGE_PYTHON_CURSES is not set
+# BR2_PACKAGE_PYTHON_GDBM is not set
+# BR2_PACKAGE_PYTHON_NIS is not set
+# BR2_PACKAGE_PYTHON_PYEXPAT is not set
+# BR2_PACKAGE_PYTHON_READLINE is not set
+# BR2_PACKAGE_PYTHON_SSL is not set
+# BR2_PACKAGE_PYTHON_TKINTER is not set
+# BR2_PACKAGE_PYTHON_UNICODEDATA is not set
+	select BR2_PACKAGE_RUBY
+	select BR2_PACKAGE_TCL
+	select BR2_PACKAGE_TCL_DEL_ENCODINGS
+	select BR2_PACKAGE_TCL_SHLIB_ONLY
+	select BR2_PACKAGE_PHP
+	select BR2_PACKAGE_PHP_CLI
+	select BR2_PACKAGE_PHP_CGI
+	select BR2_PACKAGE_PHP_FASTCGI
+
+#
+# PHP Extensions
+#
+# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
+	select BR2_PACKAGE_PHP_EXT_POSIX
+	select BR2_PACKAGE_PHP_EXT_SPL
+	select BR2_PACKAGE_PHP_EXT_SESSION
+# BR2_PACKAGE_PHP_EXT_OPENSSL is not set
+	select BR2_PACKAGE_PHP_EXT_LIBXML2
+# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
+	select BR2_PACKAGE_PHP_EXT_ZLIB
+# BR2_PACKAGE_PHP_EXT_EXIF is not set
+	select BR2_PACKAGE_PHP_EXT_FTP
+	select BR2_PACKAGE_PHP_EXT_GETTEXT
+# BR2_PACKAGE_PHP_EXT_GMP is not set
+# BR2_PACKAGE_PHP_EXT_JSON is not set
+	select BR2_PACKAGE_PHP_EXT_READLINE
+	select BR2_PACKAGE_PHP_EXT_NCURSES
+# BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
+# BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
+# BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
+# BR2_PACKAGE_PHP_EXT_ZIP is not set
+# BR2_PACKAGE_PHP_EXT_FILTER is not set
+# BR2_PACKAGE_PHP_EXT_OPENSSL is not set
+# BR2_PACKAGE_PHP_EXT_GMP is not set
+#
+# Database extensions
+#
+	select BR2_PACKAGE_PHP_EXT_SQLITE
+# BR2_PACKAGE_PHP_EXT_SQLITE_UTF8 is not set
+	select BR2_PACKAGE_PHP_EXT_PDO
+	select BR2_PACKAGE_PHP_EXT_PDO_SQLITE
+# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
+
+#
+# XML handling
+#
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_EZXML
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_LIBXSLT
+	select BR2_PACKAGE_XERCES
+
+#
+# Java
+#
+# 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
+
+	select BR2_TARGET_UBOOT
+	select BR2_TARGET_UBOOT_2009_01_RC3
+#
+# Kernel
+#
+# BR2_KERNEL_none is not set
+	select BR2_KERNEL_LINUX_ADVANCED
+# BR2_KERNEL_LINUX is not set
+# BR2_KERNEL_HURD is not set
+	select BR2_PACKAGE_LINUX
+	select BR2_LINUX_2_6_28
+

scripts/test/Makefile

@@ -0,0 +1,7 @@
+include .config
+
+
+ARCH:	
+	@echo	$(strip $(subst ",,$(BR2_ARCH)))
+#")))
+

scripts/testheader.inc

@@ -1,4 +1,9 @@
-alias mk="scripts/mkpkg"
+ARCH=`make -f scripts/test/Makefile ARCH`
+
+function mk()
+{
+	scripts/mkpkg $1 $2 "$3"
+}
 
 function	header()
 {
@@ -26,11 +31,16 @@ function	EXE()
 {
 	printf 	"EXE	"
 	if [ ${active} == 1 ] ; then
-		printf "$1	"
-		$1 $2 $3 $4 $5 $6
+		$1 $2 $3 "$4"
 		return 0;
 	else
-		echo "$1 $2 $3 $4 $5 $6"
+		printf	"%-8s"	"$1"
+		printf	"%-32s"	"$2"
+		printf	"%-16s"	"$3"
+		if [ "${4}X" != "X" ] ; then
+			printf	"%-64s"	"\"$4\""
+		fi
+		echo
 		return 1;
 	fi
 }
@@ -42,11 +52,16 @@ function	AVR()
 		echo "mk $2 UNSUPPORTED \"$4\" $5 $6"
 		return 1;
 	elif [ ${active} == 1 ] ; then
-		printf "$1	"
-		$1 $2 $3 $4 $5 $6
+		$1 $2 "$3" "$4"
 		return 0;
 	else
-		echo "$1 $2 $3 $4 $5 $6"
+		printf	"%-8s"	"$1"
+		printf	"%-32s"	"$2"
+		printf	"%-16s"	"$3"
+		if [ "${4}X" != "X" ] ; then
+			printf	"%-64s"	"\"$4\"";
+		fi
+		echo
 		return 1;
 	fi
 }
@@ -54,29 +69,46 @@ function	AVR()
 
 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\""
+	printf "skip	%-8s" "$1"
+	printf "%-32s" "$2"
+	if [   "$3X" == "OKX" ] ; then
+		printf "%-16s"	"DISABLED"
+		if [ "${4}X" != "X" ] ; then
+			printf	"%-64s"	"\"$4\""
+		fi
+	elif [ "$3X" == "FAILX" ] ; then
+		printf "%-16s"	"DISABLED"
+		if [ "${4}X" != "X" ] ; then
+			printf	"%-64s"	"\"$4\""
+		fi
+	elif [ "$3X" == "BROKENX" ] ; then
+		printf "%-16s"	"DISABLED"
+		if [ "${4}X" != "X" ] ; then
+			printf	"%-64s"	"\"$4\""
+		fi
+	elif [ "$3X" == "DISABLEDX" ] ; then
+		printf "%-16s"	"DISABLED"
+		if [ "${4}X" != "X" ] ; then
+			printf	"%-64s"	"\"$4\""
+		fi
 	else
-		echo "DISABLED	\"$2 $3 $4\""
+		printf "%-16s"	"DISABLED"
+		if [ "${4}X" != "X" ] ; then
+			printf	"%-64s"	"\"$4\""
+		fi
 	fi
+	echo
 }
 
 function bb()
 {
-	printf 	"bb	"
+	printf 	"%-8s"	"bb"
 	if [ ${busybox} == 1 ] ; then
-		printf "$1	"
+		printf "%-8s"	"$1"
 		$1 $2 $3 $4 $5 $6
 		return 0;
 	else
-		echo "$1 $2 $3 $4 $5 $6"
+		echo "$1	$2 $3 $4 $5 $6"
 		return 1;
 	fi
 }

target/Config.in.arch

@@ -670,11 +670,10 @@ config BR2_GCC_TARGET_ARCH
 
 config BR2_GCC_TARGET_ABI
 	string
-	default apcs-gnu	if BR2_arm_dunno
+	default apcs-gnu	if BR2_ARM_OABI
 	default atpcs		if BR2_arm_dunno
 	default aapcs		if BR2_arm_dunno
-	default aapcs-linux	if BR2_arm_dunno
-	default iwmmxt		if BR2_iwmmxt
+	default aapcs-linux	if BR2_ARM_EABI
 	default 32		if BR2_MIPS_OABI32
 	default n32		if BR2_MIPS_ABI32
 	default eabi		if BR2_MIPS_EABI

target/Makefile.in

@@ -3,6 +3,56 @@ BR2_PACKAGE_LINUX_FORMAT:=$(strip $(subst ",,$(BR2_PACKAGE_LINUX_FORMAT)))
 BR2_PACKAGE_LINUX_KCONFIG:=$(strip $(subst ",,$(BR2_PACKAGE_LINUX_KCONFIG)))
 #"))
 
+
+# COPY_FILE absolute_path_to_file, target_directory, filename
+ifneq ($(strip $(subst ",,$(BUILDROOT_COPYTO))),)	# Use shell definition
+#"))
+define COPY_FILE
+	@echo "BUILDROOT_COPYTO: Copy to $(BUILDROOT_COPYTO)/$(strip $(3))" ; \
+	mkdir -p $(BINARIES_DIR) || echo "Could not create $(BINARIES_DIR)" ; \
+	if [ -w $(BINARIES_DIR) -o -w $(BINARIES_DIR)  ] ; then \
+		cp $(1) $(BINARIES_DIR)/$(strip $(3)) || echo "Could not copy $(3)" ;  \
+	fi ; \
+	mkdir -p $(BUILDROOT_COPYTO) || echo "Could not create $(BUILDROOT_COPYTO)" ; \
+	if [ -d $(BUILDROOT_COPYTO) -o  -w $(BUILDROOT_COPYTO) ] ; then \
+		cp $(1) $(BUILDROOT_COPYTO)/$(strip $(3)) || echo "Could not copy $(3)" ;  \
+	fi
+endef
+COPYTO=$(strip $(subst ",,$(BUILDROOT_COPYTO)))
+else ifneq ($(strip $(subst ",,$(BR2_COPYTO))),)	# Global override
+#"))
+define COPY_FILE
+	@echo "BR2_COPYTO: Copy to $(BR2_COPYTO)/$(strip $(3))" ; \
+	mkdir -p $(BINARIES_DIR) || echo "Could not create $(BINARIES_DIR)" ; \
+	if [ -w $(BINARIES_DIR) -o -w $(BINARIES_DIR)  ] ; then \
+		cp $(1) $(BINARIES_DIR)/$(strip $(3)) || echo "Could not copy $(3)" ;  \
+	fi ; \
+	if [ "$(strip $(subst ",,$(BR2_COPYTO)))X" != "X" ] ; then \
+		mkdir -p $(BR2_COPYTO)  || echo "Could not create $(BR2_COPYTO)" ; \
+		if [ -d $(BR2_COPYTO) -o -w $(BR2_COPYTO) ] ; then \
+			cp $(1) $(BR2_COPYTO)/$(strip $(3)) || echo "Could not copy $(3)" ;  \
+		fi ; \
+	fi
+endef
+#"))
+COPYTO=$(strip $(subst ",,$(BR2_COPYTO)))
+else	# Package specific copyto, or empty
+define COPY_FILE
+	@echo "Copy to $(2)/$(strip $(3))" ; \
+	mkdir -p $(BINARIES_DIR) || echo "Could not create $(BINARIES_DIR)" ; \
+	if [ -w $(BINARIES_DIR) -o -w $(BINARIES_DIR)  ] ; then \
+		cp $(1) $(BINARIES_DIR)/$(strip $(3)) || echo "Could not copy $(3)" ;  \
+	fi ; \
+	if [ "$(strip $(subst ",,$(2)))X" != "X" ] ; then \
+		mkdir -p $(2) || echo "Could not create $(2)" ; \
+		if [ -d $(2) -o  -w $(2) ] ; then \
+			cp $(1) $(2)/$(strip $(3)) || echo "Could not copy $(3)" ;  \
+		fi ; \
+	fi
+endef
+#"))
+endif
+
 # make sure to put everything that is board-specific before the tarroot targets
 include target/generic/Makefile.in
 

target/device/ARM/Config.in

@@ -1,20 +0,0 @@
-menuconfig BR2_TARGET_ARM
-	bool "Generic ARM Support"
-	depends on BR2_arm
-	depends on !BR2_TARGET_ARMLTD
-	depends on !BR2_TARGET_ATMEL
-	depends on !BR2_TARGET_SHARP
-	default y
-
-if BR2_TARGET_ARM
-
-config BR2_BOARD_NAME
-	string "Board Name"
-	default "arm"
-
-config BR2_BOARD_PATH
-	string "Board Path"
-	default "target/device/ARM"
-
-endif
-